From 2b7b59cf1fa9330903fd6540c9c828f599d87bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 12 May 2021 10:58:49 +0300 Subject: [PATCH] =?UTF-8?q?www-servers/nginx:=20=D0=B2=D0=BE=D1=81=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20sites-enabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www-servers/nginx/sites-enabled/.calculate_directory | 1 + profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/sites-enabled/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 diff --git a/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/sites-enabled/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/sites-enabled/.calculate_directory new file mode 100644 index 000000000..2c5c40cbe --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/sites-enabled/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/nginx diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index 504b1fcc8..570e86c78 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20210511.3 +remerge = 20210512 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 new file mode 100644 index 000000000..283b1169c --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=www-servers/nginx + +[overlay-calculate] +remerge = #-cl_pass_file-#