Compare commits

..

No commits in common. "af04f7464b3130a48dd9eee2668cd8da906c4fbb" and "a1b3a034c729d557e3e2d601000a74abbbcdbdf7" have entirely different histories.

2 changed files with 5 additions and 4 deletions

View file

@ -51,7 +51,9 @@ export require="${require} __apt_source/jitsi_meet __apt_update_index"
# Pre-feed debconf settings, so Jitsi's installation has a good config
# shellcheck source=type/__jitsi_meet/files/debconf_settings.sh
. "${__type}/files/debconf_settings.sh" # This defines DEBCONF_SETTINGS
__debconf_set_selections jitsi_meet --line "${DEBCONF_SETTINGS}"
__debconf_set_selections jitsi_meet --file - <<EOF
${DEBCONF_SETTINGS}
EOF
export require="${require} __debconf_set_selections/jitsi_meet"
# Install and upgrade packages as needed

View file

@ -32,7 +32,7 @@ case "$os" in
require="$install_reqs" __start_on_boot nginx
export NGINX_SITEDIR="$nginx_confdir/http.d"
export NGINX_SITEDIR="$nginx_confdir/conf.d"
export NGINX_CERTDIR="$nginx_confdir/ssl"
export NGINX_SNIPPETSDIR="$nginx_confdir/snippets"
export NGINX_WEBROOT="/var/www"
@ -158,7 +158,6 @@ for snippet in hsts 301-to-https; do
done
# Install vhost.
require="$install_reqs" __directory "$NGINX_SITEDIR"
require="__directory/$NGINX_SITEDIR" __file "$NGINX_SITEDIR/$__object_id.conf" \
require="$install_reqs" __file "$NGINX_SITEDIR/$__object_id.conf" \
--source "$vhost_conf" \
--mode 0644