From a6f6a7fba8f1b1192833196ca4f3e26bf8986498 Mon Sep 17 00:00:00 2001 From: Joachim Desroches Date: Mon, 14 Mar 2022 15:30:11 +0100 Subject: [PATCH 1/2] [__jitsi_meet]: Fix deprecated usage of __debconf_set_selections. Replace the --file parameter with the --line parameter, as recommended since cdist 6.9.6. --- type/__jitsi_meet/manifest | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/type/__jitsi_meet/manifest b/type/__jitsi_meet/manifest index 279444a..599af18 100755 --- a/type/__jitsi_meet/manifest +++ b/type/__jitsi_meet/manifest @@ -51,9 +51,7 @@ 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 --file - < Date: Mon, 14 Mar 2022 16:15:58 +0100 Subject: [PATCH 2/2] [__nginx_vhost]: follow Alpine vhost default directory change. Since nginx package version v1.10.1-r3, Alpine packagers have changed the default vhost directory from conf.d to http.d [0]. This reflects this change. [0]: alpine package commit 383ba9c0a200ed1f4b11d7db74207526ad90bbe3 --- type/__nginx_vhost/manifest | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/type/__nginx_vhost/manifest b/type/__nginx_vhost/manifest index f9ad84d..8b010f8 100644 --- a/type/__nginx_vhost/manifest +++ b/type/__nginx_vhost/manifest @@ -32,7 +32,7 @@ case "$os" in require="$install_reqs" __start_on_boot nginx - export NGINX_SITEDIR="$nginx_confdir/conf.d" + export NGINX_SITEDIR="$nginx_confdir/http.d" export NGINX_CERTDIR="$nginx_confdir/ssl" export NGINX_SNIPPETSDIR="$nginx_confdir/snippets" export NGINX_WEBROOT="/var/www" @@ -158,6 +158,7 @@ for snippet in hsts 301-to-https; do done # Install vhost. -require="$install_reqs" __file "$NGINX_SITEDIR/$__object_id.conf" \ +require="$install_reqs" __directory "$NGINX_SITEDIR" +require="__directory/$NGINX_SITEDIR" __file "$NGINX_SITEDIR/$__object_id.conf" \ --source "$vhost_conf" \ --mode 0644