From 58eaff4ef8b8042ab6aa716ad3a7623f883905a7 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 16 May 2017 00:49:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=20CDS=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20net-proxy/squidguard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- .../templates/3.5/6_ac_update_sync/world/create/server | 2 +- .../3.5/6_ac_update_sync/world/update/2017/20170515 | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170515 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini index a44b53b..3dc3177 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 20170424 +world = 20170515 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/server b/profiles/templates/3.5/6_ac_update_sync/world/create/server index 3c3f4fe..df01e48 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/server @@ -12,7 +12,7 @@ mail-filter/opendkim mail-filter/postgrey net-ftp/ftp net-mail/fetchmail -net-proxy/squidguard +#net-proxy/squidguard sys-apps/calculate-server sys-apps/most #in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170515 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170515 new file mode 100644 index 0000000..b4004af --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170515 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# + +#-ini(overlay-distros.world,#-cut()-#)-# + +#?in(os_linux_pkglist, CLD)!=# +!net-proxy/squidguard +#in#