From 71544ccc40a0861b00d8888241f816bad490f27b Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 15 Mar 2013 11:26:01 +0100 Subject: [PATCH] gentoo/proftpd: add use-flag for mysql before emerge and touch proftpd.conf before editing it (makes sense); mark ubuntu hardy as deprecated as it will be removed in 0.9.29 Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/gentoo.inc.php | 5 +++-- lib/configfiles/hardy.inc.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index 237040c9..60157843 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -352,13 +352,14 @@ milter_default_action = accept" >> /etc/postfix/main.cf', 'proftpd' => Array( 'label' => 'ProFTPd', 'commands_1' => Array( - 'emerge -av proftpd' + 'echo "net-ftp/proftpd mysql" >> /etc/portage/package.use', + 'emerge -av proftpd', + 'touch /etc/proftpd/proftpd.conf' ), 'files' => Array( 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' ), 'commands_2' => Array( - 'touch /etc/proftpd/proftpd.conf', 'chown root:0 /etc/proftpd/proftpd.conf', 'chmod 0600 /etc/proftpd/proftpd.conf', 'rc-update add proftpd default' diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index 2a85282c..cb379cfc 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -36,7 +36,7 @@ if ($vmail_group === false) { return Array( 'ubuntu_hardy' => Array( - 'label' => 'Ubuntu 8.04 (Hardy)', + 'label' => 'Ubuntu 8.04 (Hardy) *deprecated*', 'services' => Array( 'http' => Array( 'label' => $lng['admin']['configfiles']['http'],