From 84ff476dfa12c7e132a9396941b49c3024b14982 Mon Sep 17 00:00:00 2001 From: Lednerb Date: Sun, 11 Jan 2015 13:22:35 +0100 Subject: [PATCH 1/7] check Cron reload config --- lib/configfiles/trusty.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index 076be2a8..c2d352ec 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -369,7 +369,7 @@ return array( 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' ), 'restart' => array( - Settings::Get('system.crondreload') + 'service cron reload' ) ), 'awstats' => array( From 8a3745aee8b4290a238b4784a6a151312a5c9e7e Mon Sep 17 00:00:00 2001 From: Lednerb Date: Sun, 11 Jan 2015 15:42:01 +0100 Subject: [PATCH 2/7] updated service restart at courier imap/pop3 server --- lib/configfiles/trusty.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index c2d352ec..8efef10e 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -292,8 +292,9 @@ return array( 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' ), 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' + 'service courier-authdaemon restart', + 'service courier-pop restart', + 'service courier-imap restart' ) ), 'dovecot' => array( From 1cb237e8e1dfb2f1337382b52f0381ddd695a5aa Mon Sep 17 00:00:00 2001 From: Lednerb Date: Sun, 11 Jan 2015 16:01:58 +0100 Subject: [PATCH 3/7] Test zum Entfernen --- lib/configfiles/trusty.inc.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index 8efef10e..6cc287e8 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -282,21 +282,7 @@ return array( 'mail' => array( 'label' => $lng['admin']['configfiles']['mail'], 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - 'service courier-authdaemon restart', - 'service courier-pop restart', - 'service courier-imap restart' - ) - ), + 'dovecot' => array( 'label' => 'Dovecot', 'commands_1' => array( From 7d478fd3783c65ad5b2a218e980082ce8939d86c Mon Sep 17 00:00:00 2001 From: Lednerb Date: Sun, 11 Jan 2015 16:36:50 +0100 Subject: [PATCH 4/7] dovecot Installation angepasst --- lib/configfiles/trusty.inc.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index 6cc287e8..7eb84705 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -282,11 +282,24 @@ return array( 'mail' => array( 'label' => $lng['admin']['configfiles']['mail'], 'daemons' => array( - + 'courier' => array( + 'label' => 'Courier', + 'commands' => array( + 'apt-get install courier-pop courier-imap courier-authlib-mysql' + ), + 'files' => array( + 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', + 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' + ), + 'restart' => array( + '/etc/init.d/courier-authdaemon restart', + '/etc/init.d/courier-pop restart' + ) + ), 'dovecot' => array( 'label' => 'Dovecot', 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix dovecot-mysql mail-stack-delivery' + 'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql mail-stack-delivery' ), 'files' => array( From 1889958e2bb1af165d188a7bad2d67baf66f55a2 Mon Sep 17 00:00:00 2001 From: Lednerb Date: Sun, 11 Jan 2015 22:19:49 +0100 Subject: [PATCH 5/7] added missing php5-cli to installation script --- lib/configfiles/trusty.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index 7eb84705..857907e8 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -89,7 +89,7 @@ return array( 'nginx' => array( 'label' => 'Nginx Webserver', 'commands_1' => array( - 'apt-get install nginx php5-cgi', + 'apt-get install nginx php5-cgi php5-cli', ), 'files' => array( 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', From ab44d27914b99992825d2f34892cd3aa7a1cc613 Mon Sep 17 00:00:00 2001 From: Lednerb Date: Mon, 12 Jan 2015 14:25:10 +0100 Subject: [PATCH 6/7] Deleted unnecessary config prompts --- lib/configfiles/trusty.inc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php index 857907e8..0259358b 100644 --- a/lib/configfiles/trusty.inc.php +++ b/lib/configfiles/trusty.inc.php @@ -302,15 +302,10 @@ return array( 'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql mail-stack-delivery' ), 'files' => array( - 'etc_dovecot_conf.d_01_mail_stack_delivery.conf' => '/etc/dovecot/conf.d/01-mail-stack-delivery.conf', 'etc_dovecot_conf.d_10_auth.conf' => '/etc/dovecot/conf.d/10-auth.conf', - 'etc_dovecot_conf.d_auth-sql.conf.ext' => '/etc/dovecot/conf.d/auth-sql.conf.ext', 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext' ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf.ext' - ), 'restart' => array( 'service dovecot restart' ) From e7d07c7924ab7d4df24ff7cef1d74924480a8197 Mon Sep 17 00:00:00 2001 From: Lednerb Date: Mon, 12 Jan 2015 14:32:00 +0100 Subject: [PATCH 7/7] Deleted unnecessary config template --- .../dovecot/etc_dovecot_conf.d_auth-sql.conf.ext | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext diff --git a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext b/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext deleted file mode 100644 index 156a491b..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext +++ /dev/null @@ -1,8 +0,0 @@ -passdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -} -userdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -}