diff --git a/debian/alternc-slave.dirs b/debian/alternc-slave.dirs index f9b3d65c..1d010d86 100644 --- a/debian/alternc-slave.dirs +++ b/debian/alternc-slave.dirs @@ -2,7 +2,6 @@ etc/alternc etc/alternc/templates etc/bind etc/bind/templates -etc/courier etc/phpmyadmin etc/postfix etc/squirrelmail diff --git a/debian/alternc-slave.templates b/debian/alternc-slave.templates index bc1d0b7b..0b7f9fea 100644 --- a/debian/alternc-slave.templates +++ b/debian/alternc-slave.templates @@ -4,7 +4,7 @@ Default: true _Description: Do you REALLY want to install AlternC on this computer ? You are currently trying to install AlternC on your computer. Be aware that this package will overwrite critical system files, including but not - limited to the config files of bind, postfix, courier, squirrelmail and proftpd. + limited to the config files of bind, postfix, dovecot, squirrelmail and proftpd. . A backup of your old configuration will be stored in "/var/backups/alternc/etc-original-`date`.tar.gz". diff --git a/debian/alternc.dirs b/debian/alternc.dirs index c8179b2e..1e2c48cb 100644 --- a/debian/alternc.dirs +++ b/debian/alternc.dirs @@ -4,7 +4,6 @@ etc/alternc/templates/apache2 etc/alternc/functions_hosting etc/bind etc/bind/templates -etc/courier etc/cron.d etc/phpmyadmin etc/postfix diff --git a/debian/templates b/debian/templates index 61b2cb99..4701930f 100644 --- a/debian/templates +++ b/debian/templates @@ -4,7 +4,7 @@ Default: true _Description: Do you REALLY want to install AlternC on this computer ? You are currently trying to install AlternC on your computer. Be aware that this package will overwrite critical system files, including but not - limited to the config files of bind, postfix, courier, squirrelmail and proftpd. + limited to the config files of bind, postfix, dovecot, squirrelmail and proftpd. . A backup of your old configuration will be stored in "/var/backups/alternc/etc-original-`date`.tar.gz". diff --git a/install/alternc.install b/install/alternc.install index 7bee7cc2..b26a972b 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -40,10 +40,6 @@ if [ -e /etc/bind/named.conf ]; then CONFIG_FILES="$CONFIG_FILES etc/bind/templates/zone.template etc/bind/templates/named.template etc/bind/named.conf.options" fi -if [ -e /etc/courier/authdaemonrc ]; then - CONFIG_FILES="$CONFIG_FILES etc/courier/authdaemonrc - etc/courier/authmysqlrc" -fi if [ -d /etc/postfix ]; then CONFIG_FILES="$CONFIG_FILES etc/postfix/myalias.cf etc/postfix/myrelay.cf etc/postfix/mydomain.cf etc/postfix/mygid.cf @@ -284,11 +280,6 @@ done < $postfix_conf OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'` echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION" -if [ -e /etc/courier/authmysqlrc ] ; then - chown root:root /etc/courier/authmysqlrc - chmod 640 /etc/courier/authmysqlrc -fi - if [ -e /etc/proftpd.conf ] ; then chmod 640 /etc/proftpd/proftpd.conf fi @@ -326,9 +317,7 @@ tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES ####################################################################### # Reload services # -for service in postfix bind9 courier-authdaemon \ - courier-imap courier-imap-ssl courier-pop courier-pop-ssl \ - cron proftpd; do +for service in postfix bind9 dovecot cron proftpd; do invoke-rc.d $service force-reload || true done