From e530e53dcb8c609bd66f7f92042646eec2f5ad1e Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 02:05:28 +0100 Subject: [PATCH 1/4] Fixed missing paths and USE-flags for gentoo/dovecot --- lib/configfiles/gentoo.inc.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index b85e04e5..de5dae0c 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -303,11 +303,12 @@ milter_default_action = accept" >> /etc/postfix/main.cf', 'dovecot' => Array( 'label' => 'Dovecot 1', 'commands_1' => Array( + 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use' 'emerge -av dovecot', - 'mv dovecot.conf dovecot.conf.gentoo', - 'mv dovecot-sql.conf dovecot-sql.conf.gentoo', - 'touch dovecot.conf', - 'touch dovecot-sql.conf', + 'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo', + 'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo', + 'touch /etc/dovecot/dovecot.conf', + 'touch /etc/dovecot/dovecot-sql.conf', ), 'files' => Array( 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', @@ -324,11 +325,12 @@ milter_default_action = accept" >> /etc/postfix/main.cf', 'dovecot2' => Array( 'label' => 'Dovecot 2', 'commands_1' => Array( + 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use' 'emerge -av dovecot', - 'mv dovecot.conf dovecot.conf.gentoo', - 'mv dovecot-sql.conf dovecot-sql.conf.gentoo', - 'touch dovecot.conf', - 'touch dovecot-sql.conf', + 'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo', + 'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo', + 'touch /etc/dovecot/dovecot.conf', + 'touch /etc/dovecot/dovecot-sql.conf', ), 'files' => Array( 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', From 648f52a262ef1dcd710e3aaa424610dfad3f9477 Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 02:12:34 +0100 Subject: [PATCH 2/4] missed ',' --- lib/configfiles/gentoo.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index de5dae0c..237040c9 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -303,7 +303,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf', 'dovecot' => Array( 'label' => 'Dovecot 1', 'commands_1' => Array( - 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use' + 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use', 'emerge -av dovecot', 'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo', 'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo', @@ -325,7 +325,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf', 'dovecot2' => Array( 'label' => 'Dovecot 2', 'commands_1' => Array( - 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use' + 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use', 'emerge -av dovecot', 'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo', 'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo', From 4155fdfd4ba6860841b8012cecd21ccb06bdf216 Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 02:14:56 +0100 Subject: [PATCH 3/4] Disable SSL by default so dovecot can start without certificates --- .../misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf index b7ab0f9d..50350f1f 100644 --- a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf @@ -9,6 +9,7 @@ protocols = imap pop3 ### SSL Settings ### After setting this options, set disable_plaintext_auth to yes (see above) +ssl = no #ssl_cert = .pem #ssl_key = .key From 5612fb1c8d0b20e4bd94f51d182c2f1b2fe75ee4 Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 02:16:12 +0100 Subject: [PATCH 4/4] Add a warning related to SSL --- .../misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf index 50350f1f..971b2628 100644 --- a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf @@ -8,7 +8,8 @@ mail_debug = no protocols = imap pop3 ### SSL Settings -### After setting this options, set disable_plaintext_auth to yes (see above) +### After you obtained an SSL-certificate enable ssl here and +### set disable_plaintext_auth to yes (see above) ssl = no #ssl_cert = .pem #ssl_key = .key