diff --git a/wheezy/alternc.install.diff b/wheezy/alternc.install.diff index c30d6369..cd47f918 100644 --- a/wheezy/alternc.install.diff +++ b/wheezy/alternc.install.diff @@ -1,5 +1,5 @@ ---- ../install/alternc.install 2013-05-28 06:38:00.000000000 +0200 -+++ alternc.install 2013-05-28 15:01:52.000000000 +0200 +--- alternc.install 2013-06-14 18:13:46.000000000 +0200 ++++ alternc.install.wheezy 2013-06-14 18:17:16.694449173 +0200 @@ -77,7 +77,7 @@ fi @@ -13,7 +13,7 @@ fi # We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ ) -- sed -i -e 's#/etc/ssl/certs/ssl-cert-snakeoil.pem#/etc/alternc/apache.pem#' -e 's#/etc/ssl/private/ssl-cert-snakeoil.key# /etc/alternc/apache.pem#' /etc/dovecot/dovecot.conf +- sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf + ( echo "ssl_cert = /etc/dovecot/conf.d/96_ssl.conf else @@ -22,7 +22,7 @@ cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/ # We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ ) -- sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf +- sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf + ( echo "ssl_cert = /etc/dovecot/conf.d/96_ssl.conf echo "SSL not configured"