X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=8b4eb47ebac3566c16a6480ac86c7965ccd780b6;hb=a9ff5d97ac0cfb5196da34f0275348c977326158;hp=868dad43a8b7589623b2aa16ce5b5a3f9ba36361;hpb=83c59ff2f6f893e986abcec3b8ba20682ec906de;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index 868dad4..8b4eb47 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -60,7 +60,7 @@ if [ -f /etc/postfix/master.cf ]; then
                    /etc/postfix/master.cf || true
 fi
 
-# ovo  manje/vise uzima kao default, ali u slucaju da je multihomed stroj,
+# ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj,
 # i eventualno je sprckan, mozda nesto nece raditi kako spada pa cemo konfigurirati
 postconf -e myhostname="$fqdn"
 postconf -e mydomain="$domain"
@@ -107,10 +107,10 @@ if [ "$mx_domain" != "$fqdn" ]; then
   postconf -e relay_domains="\$mydestination"
   if [ "$mx_domain" != "$domain" ]; then
     if dpkg --compare-versions "$2" lt 2.1.5-8; then
-      cp_echo "CN: This host is MX for more than one domain!  postfix-cn package will"
-      cp_echo "CN  only set up $mx_domain, you HAVE TO add the other domains manually"
-      cp_echo "CN  to mydestination variable in /etc/postfix/main.cf, if you haven't"
-      cp_echo "CN  done that already or you may lose mail."
+      cp_echo "CN: This host is MX for more than one domain! postfix-cn package will"
+      cp_echo "CN: only set up $mx_domain, you HAVE TO add the other domains manually"
+      cp_echo "CN: to mydestination variable in /etc/postfix/main.cf, if you haven't"
+      cp_echo "CN: done that already or you may lose mail."
     fi
   fi
 fi
@@ -203,22 +203,17 @@ if [ -f /etc/default/saslauthd ]; then
     echo "START=yes" >> /etc/default/saslauthd
     restart_saslauthd="yes"
   fi
-  if ! grep -q "^PARAMS.*/var/spool/postfix/var/run/saslauthd" /etc/default/saslauthd; then
-    echo "PARAMS=\"-m /var/spool/postfix/var/run/saslauthd\"" >> /etc/default/saslauthd
-    restart_saslauthd="yes"
-  fi
-  if ! grep -q "^PIDFILE.*/var/spool/postfix/var/run/saslauthd/saslauthd.pid" /etc/default/saslauthd; then
-    echo "PIDFILE=\"/var/spool/postfix/var/run/saslauthd/saslauthd.pid\"" >> /etc/default/saslauthd
-    restart_saslauthd="yes"
-  fi
-  if ! grep -q "^PWDIR.*/var/spool/postfix/var/run/saslauthd" /etc/default/saslauthd; then
-    echo "PWDIR=\"/var/spool/postfix/var/run/saslauthd\"" >> /etc/default/saslauthd
+
+  if ! grep -q "^OPTIONS.*/var/spool/postfix/var/run/saslauthd" /etc/default/saslauthd; then
+    echo "OPTIONS=\"-c -m /var/spool/postfix/var/run/saslauthd\"" >> /etc/default/saslauthd
     restart_saslauthd="yes"
   fi
+
   if ! grep -q "&& ln -s" /etc/default/saslauthd; then
     echo "[ ! -L /var/run/saslauthd -a -d /var/spool/postfix/var/run/saslauthd -a ! -d /var/run/saslauthd ] && ln -s /var/spool/postfix/var/run/saslauthd /var/run/saslauthd || true" >> /etc/default/saslauthd
     restart_saslauthd="yes"
   fi
+
   if [ ! -L /var/run/saslauthd ]; then
     mkdir -p /var/spool/postfix/var/run/
     if [ -d /var/run/saslauthd -a ! -d /var/spool/postfix/var/run/saslauthd ]; then
@@ -226,18 +221,18 @@ if [ -f /etc/default/saslauthd ]; then
     elif [ -d /var/run/saslauthd -a -d /var/spool/postfix/var/run/saslauthd ]; then
       rm -rf /var/run/saslauthd/
     fi
-
     # XXX jos kad bi ln -s u /var/run/ radio (bootclean.sh)
     if [ -d /var/spool/postfix/var/run/saslauthd -a ! -d /var/run/saslauthd ]; then
       ln -s /var/spool/postfix/var/run/saslauthd /var/run/saslauthd
     fi
-
     restart_saslauthd="yes"
   fi
+
   if [ ! -d /var/spool/postfix/var/run/saslauthd ]; then
     mkdir -p /var/spool/postfix/var/run/saslauthd
     restart_saslauthd="yes"
   fi
+
   if ! dpkg-statoverride --list /var/spool/postfix/var/run/saslauthd > /dev/null; then
     dpkg-statoverride --update --add root sasl 710 /var/spool/postfix/var/run/saslauthd
   fi
@@ -274,20 +269,20 @@ $fqdn
 root@$mailname
 +
   ln -sf "$cert.pem" `openssl x509 -noout -hash < "$cert.pem"`.0
-  chown root.root "/etc/ssl/certs/$cert.pem"
+  chown root:root "/etc/ssl/certs/$cert.pem"
   chmod 0640 "/etc/ssl/certs/$cert.pem"
 fi
 
 # TLS stuff
 postconf -e smtp_use_tls="yes"
-postconf -e smtp_tls_key_file="\$smtp_tls_cert_file"
 postconf -e smtp_tls_session_cache_database="sdbm:/var/lib/postfix/smtp_scache"
 postconf -e smtp_tls_session_cache_timeout="3600s"
 postconf -e smtpd_use_tls="yes"
-postconf -e smtpd_tls_key_file="\$smtpd_tls_cert_file"
 postconf -e smtpd_tls_session_cache_database="sdbm:/var/lib/postfix/smtpd_scache"
 postconf -e smtpd_tls_session_cache_timeout="3600s"
 postconf -e tls_random_source="dev:/dev/urandom"
+postconf -e smtpd_tls_exclude_ciphers="aNULL"
+postconf -e smtpd_tls_mandatory_exclude_ciphers="aNULL"
 # ako je postavljen neki drugi certifikat, ne diraj
 smtp_tls_cert_file="`postconf -h smtp_tls_cert_file`"
 if [ -z "$smtp_tls_cert_file" ]; then
@@ -297,6 +292,14 @@ smtpd_tls_cert_file="`postconf -h smtpd_tls_cert_file`"
 if [ -z "$smtpd_tls_cert_file" ]; then
   postconf -e smtpd_tls_cert_file="/etc/ssl/certs/$cert.pem"
 fi
+smtp_tls_key_file="`postconf -h smtp_tls_key_file`"
+if [ -z "$smtp_tls_key_file" ]; then
+  postconf -e smtp_tls_key_file="\$smtp_tls_cert_file"
+fi
+smtpd_tls_key_file="`postconf -h smtpd_tls_key_file`"
+if [ -z "$smtpd_tls_key_file" ]; then
+  postconf -e smtpd_tls_key_file="\$smtpd_tls_cert_file"
+fi
 
 # prije bilo u /etc/postfix/, od verzije 2.1.5-2 je u /var/spool/postfix
 [ -f /etc/postfix/smtp_scache.dir ] && rm -f /etc/postfix/smtp_scache.dir