From cbba9e00e7ae1f45ea8d90e66f4eef22f82c60b9 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 8 Sep 2015 13:03:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.2/6_ac_update_sync/world/0-ini | 2 +- .../templates/3.2/6_ac_update_sync/world/create/server | 4 ++++ .../templates/3.2/6_ac_update_sync/world/create/tools | 2 ++ .../6_ac_update_sync/world/update/100-199/{142 => 143} | 10 ++++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{142 => 143} (80%) diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index 683e6ef..4b574d2 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 142 +world = 143 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server index 857dcfa..90bb46d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server @@ -24,8 +24,12 @@ sys-apps/most #in# #?in(os_linux_pkglist, CDS+)!=# +dev-db/redis dev-lang/php dev-vcs/gitolite +mail-filter/spamassassin +net-fs/netatalk +net-ftp/vsftpd net-misc/asterisk net-misc/hylafaxplus www-servers/lighttpd diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index 7a39e56..1aa8131 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -131,6 +131,7 @@ sys-process/iotop app-admin/conky app-admin/keepassx app-arch/arj +app-arch/unrar app-cdr/gcdemu app-editors/emacs app-editors/ghex @@ -191,6 +192,7 @@ net-fs/davfs2 net-misc/aria2 net-misc/iaxmodem net-misc/iperf +net-nds/shelldap sys-apps/lshw sys-apps/setserial sys-fs/avfs diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/142 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/143 similarity index 80% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/142 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/143 index 32fb8e7..fa01cef 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/142 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/143 @@ -1,9 +1,10 @@ -# Calculate format=world name=world ini(overlay-distros.world)<142 +# Calculate format=world name=world ini(overlay-distros.world)<143 -#-ini(overlay-distros.world,142)-# +#-ini(overlay-distros.world,143)-# #?in(os_linux_pkglist, CLDX+)!=# app-arch/arj +app-arch/unrar app-editors/emacs dev-python/xlwt games-sports/xmoto @@ -18,12 +19,17 @@ x11-wm/icewm #in# #?in(os_linux_pkglist, CDS+)!=# +dev-db/redis !dev-vcs/gitolite-gentoo dev-vcs/gitolite +mail-filter/spamassassin +net-fs/netatalk +net-ftp/vsftpd net-misc/asterisk net-misc/hylafaxplus net-misc/iaxmodem net-misc/youtube-dl +net-nds/shelldap net-p2p/bittorrent net-p2p/btpd net-p2p/mldonkey