install_postfix_advanced.sh: remove depredated parameter 'permit_mx_backup'.

README.install

@@ -58,7 +58,7 @@
    -  create configuration file 'install_update_dovecot.conf'
          cp -a conf install_update_dovecot.conf.sample install_update_dovecot.conf
    - adjust configuration file 'install_update_dovecot.conf' to your needs
-   - run script 'install_update_dovecot.sh'
+   - run script 'install_update_dovecot-2.4.sh' # the old one was: 'install_update_dovecot.sh'
 
    Note:
       Maybe you have to finish installing postfixadmin, i.e creating admin account(s).

conf/install_update_dovecot.conf.sample

@@ -145,7 +145,7 @@ dbhost=""
 # - Cert/Key configurations
 # ---
 
-cert_base_dir="/etc/postfix/ssl"
+cert_base_dir="/etc/dovecot/ssl"
 server_cert=${cert_base_dir}/mailserver.crt
 server_key=${cert_base_dir}/mailserver.key
 dh_pem_file="${cert_base_dir}/dh_4096.pem"

install_amavis.sh

@@ -2257,6 +2257,45 @@ if ! $installation_failed ; then
    fi
 fi
 
+# Create /etc/spamassassin/99_nullsender.cf
+#
+# Spamassassin Regeln für Nullsender (Return-Path: <>)
+#
+# Problem:
+#     echte DSNs haben ebenfalls Return-Path: <>
+#
+# Aber:
+#     Echte DSNs sind i.d.R. multipart/report (delivery-status)
+#
+echononl "   Create file \"/etc/spamassassin/99_nullsender.cf\".."
+cat <<'EOF' > /etc/spamassassin/99_nullsender.cf 2> $tmp_err_msg
+########################################################################
+# Null-sender (Return-Path: <>) Behandlung
+# Ziel: Fake-Bounces markieren, echte DSNs nicht treffen
+########################################################################
+
+# 1) Null-Envelope-From erkannt
+header  LOCAL_NULL_SENDER      Return-Path =~ /^<>$/i
+describe LOCAL_NULL_SENDER     Null envelope-from (Return-Path <>)
+score   LOCAL_NULL_SENDER      0.1
+
+# 2) Echte DSNs sind i.d.R. multipart/report (delivery-status)
+header  LOCAL_DSN_MULTIPART    Content-Type =~ /^multipart\/report\b/i
+describe LOCAL_DSN_MULTIPART   Looks like a real DSN (multipart/report)
+score   LOCAL_DSN_MULTIPART    -3.0
+
+# 3) Fake-Bounce: Null-sender, aber NICHT multipart/report
+meta    LOCAL_NULL_NOT_DSN     LOCAL_NULL_SENDER && !LOCAL_DSN_MULTIPART
+describe LOCAL_NULL_NOT_DSN    Null-sender but not a DSN (likely fake bounce spam)
+score   LOCAL_NULL_NOT_DSN     6.0
+EOF
+if [[ $? -eq 0 ]] ; then
+   echo_ok
+else
+   echo_failed
+   error "$(cat $tmp_err_msg)"
+fi
+
 
 # - Enable nightly cronjob for spamassassin
 # -
@@ -3260,6 +3299,18 @@ if $INSTALL_CLAMAV_UNOFFICIAL_SIGS ; then
    if [[ "$?" -ne 0 ]] ; then
       installation_failed=true
       error "$(cat $tmp_err_msg)"
+
+      warn "command was:
+
+                     git clone https://github.com/extremeshok/clamav-unofficial-sigs.git /tmp/clamav-unofficial-sigs"
+		echononl "continue anyway [yes/no]: "
+		read OK
+		OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+		while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+			echononl "Wrong entry! - repeat [yes/nno]: "
+			read OK
+		done
+		[[ $OK = "yes" ]] || fatal "Abbruch durch User"
    fi
    if ! $installation_failed ; then
       echo_ok
@@ -4957,6 +5008,7 @@ fi
 ## -  localhost:10025  inet  n       -       y       -       -       smtpd
 ## -     -o content_filter=
 ## -     -o smtpd_proxy_filter=
+## -     -o smtpd_milters=
 ## -     -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
 ## -     -o smtpd_client_restrictions=
 ## -     -o smtpd_helo_restrictions=
@@ -5031,6 +5083,8 @@ EOF
 localhost:10025  inet  n       -       y       -       -       smtpd
    -o content_filter=
    -o smtpd_proxy_filter=
+   -o smtpd_milters=
+   -o milter_macro_daemon_name=ORIGINATING
    -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
    -o smtpd_client_restrictions=
    -o smtpd_helo_restrictions=
@@ -5093,6 +5147,8 @@ EOF
 localhost:10025  inet  n       -       y       -       -       smtpd
    -o content_filter=
    -o smtpd_proxy_filter=
+   -o smtpd_milters=
+   -o milter_macro_daemon_name=ORIGINATING
    -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
    -o smtpd_client_restrictions=
    -o smtpd_helo_restrictions=
@@ -5145,6 +5201,8 @@ EOF
 localhost:10025  inet  n       -       y       -       -       smtpd
    -o content_filter=
    -o smtpd_proxy_filter=
+   -o smtpd_milters=
+   -o milter_macro_daemon_name=ORIGINATING
    -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
    -o smtpd_client_restrictions=
    -o smtpd_helo_restrictions=
@@ -5181,6 +5239,8 @@ EOF
 localhost:10025  inet  n       -       y       -       -       smtpd
    -o content_filter=
    -o smtpd_proxy_filter=
+   -o smtpd_milters=
+   -o milter_macro_daemon_name=ORIGINATING
    -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
    -o smtpd_client_restrictions=
    -o smtpd_helo_restrictions=

install_opendkim.sh

@@ -13,6 +13,9 @@ echo -e "\n   \033[32mStart Installation of OpenDKIM..\033[m"
 #conf_file="${_src_base_dir}/conf/install_opendkim.conf"
 
 log_file="$(mktemp)"
+tmp_main_cf_file="$(mktemp)"
+
+main_cf_file="/etc/postfix/main.cf"
 
 backup_date="$(date +%Y-%m-%d-%H%M)"
 
@@ -27,6 +30,8 @@ postfix_spool_dir="/var/spool/postfix"
 opendkim_socket_dir="${postfix_spool_dir}/opendkim"
 opendkim_socket_file="${opendkim_socket_dir}/opendkim.sock"
 
+opendkim_socket_string="local:/opendkim/opendkim.sock"
+
 postfix_needs_restart=false
 opendkim_needs_restart=false
 
@@ -87,6 +92,82 @@ echo_skipped() {
    echo -e "\033[80G[ \033[37mskipped\033[m ]"
 }
 
+# Funktion stellt sicher, dass in /etc/postfix/main.cf
+# - smtpd_milters
+# - non_smtpd_milters
+# den Wert "local:/opendkim/opendkim.sock" enthalten.
+#
+# Logik:
+# 1) Existiert eine aktive Zeile (nicht auskommentiert)? → anpassen
+# 2) Sonst: existiert eine auskommentierte Zeile? → ersetzen (entkommentieren)
+# 3) Sonst: Variable am Ende der Datei hinzufügen
+#
+
+ensure_dkim_var() {
+  local var="$1"
+
+  awk -v var="$var" -v dkim="$opendkim_socket_string" '
+    # trim helper
+    function trim(s) {
+      sub("^[[:space:]]+", "", s)
+      sub("[[:space:]]+$", "", s)
+      return s
+    }
+
+    # Normalisiert aktive Werte:
+    # - wenn leer -> nur dkim
+    # - wenn dkim schon enthalten -> unverändert
+    # - sonst -> dkim vorne dran
+    function normalize_active_value(v) {
+      v = trim(v)
+      if (v == "") return dkim
+      if (index(v, dkim) > 0) return v
+      return dkim "," v
+    }
+
+    BEGIN { found_active=0; replaced_commented=0 }
+
+    #################################################################
+    # FALL 1: Aktive Zeile (nicht auskommentiert): var =
+    #################################################################
+    $0 ~ "^[[:space:]]*"var"[[:space:]]*=" && $0 !~ "^[[:space:]]*#" {
+      found_active=1
+
+      # rechten Teil extrahieren (nach "=")
+      v=$0
+      sub("^[[:space:]]*"var"[[:space:]]*=[[:space:]]*", "", v)
+
+      print var" = " normalize_active_value(v)
+      next
+    }
+
+    #################################################################
+    # FALL 2: Auskommentierte Zeile: # var =
+    # Sonderregel: ersetzen mit NUR DKIM, unabhängig vom Kommentarinhalt
+    #################################################################
+    $0 ~ "^[[:space:]]*#[[:space:]]*"var"[[:space:]]*=" \
+       && found_active==0 && replaced_commented==0 {
+      replaced_commented=1
+      print var" = " dkim
+      next
+    }
+
+    #################################################################
+    # Sonst: Zeile unverändert ausgeben
+    #################################################################
+    { print }
+
+    #################################################################
+    # FALL 3: Variable nicht vorhanden → am Ende hinzufügen
+    #################################################################
+    END {
+      if (found_active==0 && replaced_commented==0) {
+        print var" = " dkim
+      }
+    }
+  ' "$main_cf_file"
+}
+
 
 # -------------
 # - Some pre-installation tasks
@@ -610,19 +691,15 @@ else
 fi
 
 echononl "   Activate processing of e-mail through the OpenDKIM daemon.."
-if grep -q -E "milter_default_action\s*=\s*accept" /etc/postfix/main.cf ; then
+if grep -q -E "^\s*#?\s*smtpd_milters\s*=" ${main_cf_file} ; then
-   echo_skipped
+
-   warn "Postfix (main.cf) seems already be configured for milters"
+   ensure_dkim_var "smtpd_milters"     > "${tmp_main_cf_file}"
-   echononl "   Delete previosly saved Postfix configuration.."
+   cp "${tmp_main_cf_file}" "${main_cf_file}"
-   rm /etc/postfix/main.cf.$backup_date 2> $log_file
+
-   if [[ $? -eq 0 ]] ; then
-      echo_ok
-   else
-      echo_failed
-      error "$(cat $log_file)"
-   fi
 else
-   cat <<EOF >> /etc/postfix/main.cf 2> $log_file
+
+      cat <<EOF >> /etc/postfix/main.cf 2> $log_file
+
 
 # ======= Milter configuration =======
 
@@ -642,8 +719,19 @@ milter_protocol = 6
 #    'smtpd_milters = local:/opendkim/opendkim.sock' here and add to
 #    localhost:10025 section in master.cf: 'smtpd_milters='
 #
-#smtpd_milters = local:/opendkim/opendkim.sock
+smtpd_milters = $opendkim_socket_string
-smtpd_milters = local:/opendkim/opendkim.sock
+EOF
+
+fi
+
+if grep -q -E "^\s*#?\s*non_smtpd_milters\s*=" ${main_cf_file} ; then
+
+   ensure_dkim_var "non_smtpd_milters"     > "${tmp_main_cf_file}"
+   cp "${tmp_main_cf_file}" "${main_cf_file}"
+
+else
+
+      cat <<EOF >> /etc/postfix/main.cf 2> $log_file
 
 # Was sind non_smtpd_milters?
 #
@@ -673,15 +761,15 @@ smtpd_milters = local:/opendkim/opendkim.sock
 #
 #
 # DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
-non_smtpd_milters = local:/opendkim/opendkim.sock
+non_smtpd_milters = $opendkim_socket_string
 EOF
-   postfix_needs_restart=true
+fi
-   if [[ $? -eq 0 ]] ; then
+postfix_needs_restart=true
-      echo_ok
+if [[ $? -eq 0 ]] ; then
-   else
+   echo_ok
-      echo_failed
+else
-      error "$(cat $log_file)"
+   echo_failed
-   fi
+   error "$(cat $log_file)"
 fi
 
 
@@ -816,4 +904,5 @@ fi
 
 echo ""
 rm -f "$log_file"
+rm -f "$tmp_main_cf_file"
 exit 0

install_opendmarc.sh

@@ -52,8 +52,15 @@ done
 postfix_needs_restart=false
 opendmarc_needs_restart=false
 
-backup_date="$(date +%Y-%m-%d-%H%M)"
 log_file="$(mktemp)"
+tmp_main_cf_file="$(mktemp)"
+
+main_cf_file="/etc/postfix/main.cf"
+
+backup_date="$(date +%Y-%m-%d-%H%M)"
+
+opendkim_socket_string="local:/opendkim/opendkim.sock"
+opendmarc_socket_string="local:/opendmarc/opendmarc.sock"
 
 # -------------
 # --- Some functions
@@ -111,6 +118,116 @@ echo_skipped() {
    echo -e "\033[80G[ \033[37mskipped\033[m ]"
 }
 
+# iFubction stellt sicher, dass OpenDMARC milter in main.cf gesetzt ist
+# und (falls OpenDKIM vorhanden ist) OpenDMARC direkt nach OpenDKIM folgt.
+#
+# Ziel:
+# - smtpd_milters und non_smtpd_milters enthalten: local:/opendmarc/opendmarc.sock
+# - Falls local:/opendkim/opendkim.sock vorhanden ist:
+#     ...opendkim...,local:/opendmarc/opendmarc.sock,...
+#
+# Logik:
+# 1) Aktive Zeile existiert? → anpassen
+# 2) Sonst kommentierte Zeile existiert? → ersetzen (entkommentieren) an derselben Stelle
+# 3) Sonst am Ende hinzufügen
+ensure_dmarc_var() {
+  local var="$1"
+
+  awk -v var="$var" -v dmarc="$opendmarc_socket_string" -v dkim="$opendkim_socket_string" '
+    function trim(s) {
+      sub("^[[:space:]]+", "", s)
+      sub("[[:space:]]+$", "", s)
+      return s
+    }
+
+    # Normalisiert aktive Werte:
+    # - Entfernt vorhandenes dmarc (um Duplikate zu verhindern)
+    # - Fügt dmarc wieder ein:
+    #     - direkt nach dkim, falls dkim vorhanden
+    #     - sonst ans Ende (oder allein, wenn leer)
+    function normalize_active_value(v,    n,i,t,has_dkim,out,newn) {
+      v = trim(v)
+      if (v == "") return dmarc
+
+      # split an Komma, trimmen, DMARC entfernen
+      n = split(v, a, ",")
+      has_dkim = 0
+      newn = 0
+
+      for (i=1; i<=n; i++) {
+        t = trim(a[i])
+        if (t == "") continue
+        if (t == dmarc) continue              # Duplikate vermeiden
+        a[++newn] = t
+        if (t == dkim) has_dkim = 1
+      }
+      n = newn
+
+      out = ""
+
+      if (has_dkim) {
+        # Ausgabe bauen und DMARC direkt nach DKIM einfügen
+        for (i=1; i<=n; i++) {
+          if (out != "") out = out ","
+          out = out a[i]
+          if (a[i] == dkim) {
+            out = out "," dmarc
+          }
+        }
+        return out
+      }
+
+      # kein DKIM: DMARC ans Ende anhängen
+      for (i=1; i<=n; i++) {
+        if (out != "") out = out ","
+        out = out a[i]
+      }
+      if (out == "") return dmarc
+      return out "," dmarc
+    }
+
+    BEGIN { found_active=0; replaced_commented=0 }
+
+    #################################################################
+    # FALL 1: Aktive Zeile (nicht auskommentiert): var =
+    #################################################################
+    $0 ~ "^[[:space:]]*"var"[[:space:]]*=" && $0 !~ "^[[:space:]]*#" {
+      found_active=1
+
+      v=$0
+      sub("^[[:space:]]*"var"[[:space:]]*=[[:space:]]*", "", v)
+
+      print var" = " normalize_active_value(v)
+      next
+    }
+
+    #################################################################
+    # FALL 2: Auskommentierte Zeile: # var =
+    # Sonderregel: ersetzen mit NUR DMARC, unabhängig vom Kommentarinhalt
+    #################################################################
+    $0 ~ "^[[:space:]]*#[[:space:]]*"var"[[:space:]]*=" \
+       && found_active==0 && replaced_commented==0 {
+      replaced_commented=1
+      print var" = " dmarc
+      next
+    }
+
+    #################################################################
+    # Sonst: Zeile unverändert ausgeben
+    #################################################################
+    { print }
+
+    #################################################################
+    # FALL 3: Variable nicht vorhanden → am Ende hinzufügen
+    #################################################################
+    END {
+      if (found_active==0 && replaced_commented==0) {
+        print var" = " dmarc
+      }
+    }
+  ' "$main_cf_file"
+}
+
 
 # -------------
 # - Some pre-installation tasks
@@ -764,26 +881,26 @@ else
    error "$(cat $log_file)"
 fi
 
-echononl "   Set Variable non_smtpd_milters at '/etc/postfix/main.cf'.."
+#echononl "   Set Variable non_smtpd_milters at '/etc/postfix/main.cf'.."
-if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*opendkim.sock" /etc/postfix/main.cf 2> /dev/null) ; then
+#if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*opendkim.sock" /etc/postfix/main.cf 2> /dev/null) ; then
-   if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*$(basename "${opendmarc_socket_file}")" /etc/postfix/main.cf); then
+#   if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*$(basename "${opendmarc_socket_file}")" /etc/postfix/main.cf); then
-      echo_skipped
+#      echo_skipped
-   else
+#   else
-      perl -i -n -p -e "s&^\s*(non_smtpd_milters\s*=.*opendkim.sock)&\1,local:/$(basename "${opendmarc_socket_dir}")/$(basename "${opendmarc_socket_file}")&" \
+#      perl -i -n -p -e "s&^\s*(non_smtpd_milters\s*=.*opendkim.sock)&\1,local:/$(basename "${opendmarc_socket_dir}")/$(basename "${opendmarc_socket_file}")&" \
-         /etc/postfix/main.cf > $log_file 2>&1
+#         /etc/postfix/main.cf > $log_file 2>&1
-      if [[ $? -eq 0 ]] ; then
+#      if [[ $? -eq 0 ]] ; then
-         echo_ok
+#         echo_ok
-         postfix_needs_restart=true
+#         postfix_needs_restart=true
-      else
+#      else
-         echo_failed
+#         echo_failed
-         error "$(cat $log_file)"
+#         error "$(cat $log_file)"
-      fi
+#      fi
-   fi
+#   fi
-else
+#else
-
+#
-   echo_skipped
+#   echo_skipped
-   warn "non_smtpd_milters is not adjusted. Complete Postfix configuration (main.cf) manually\!"
+#   warn "non_smtpd_milters is not adjusted. Complete Postfix configuration (main.cf) manually\!"
-fi
+#fi
 
 
 echononl "   Set Variable smtpd_milters at '/etc/postfix/main.cf'.."
@@ -823,30 +940,26 @@ else
    error "$(cat $log_file)"
 fi
 
-echononl "   Activate processing of e-mail through the OpenDKIM daemon.."
+echononl "   Activate processing of e-mail through the OpenDMARC daemon.."
-if grep -q -E "milter_default_action\s*=\s*accept" /etc/postfix/main.cf ; then
+if grep -q -E "^\s*#?\s*smtpd_milters\s*=" ${main_cf_file} ; then
-   echo_skipped
+
-   info "Postfix (main.cf) was not changed - seems already be configured right."
+   ensure_dmarc_var "smtpd_milters"     > "${tmp_main_cf_file}"
-   echononl "   Delete previosly saved Postfix configuration.."
+   cp "${tmp_main_cf_file}" "${main_cf_file}"
-   rm /etc/postfix/main.cf.$backup_date 2> $log_file
+
-   if [[ $? -eq 0 ]] ; then
-      echo_ok
-   else
-      echo_failed
-      error "$(cat $log_file)"
-   fi
 else
-   cat <<EOF >> /etc/postfix/main.cf 2> $log_file
+
+      cat <<EOF >> /etc/postfix/main.cf 2> $log_file
+
 
 # ======= Milter configuration =======
 
-# OpenDKIM, OpenDMARC
+# OpenDKIM
 
 milter_default_action = accept
 
 # Postfix ≥ 2.6 milter_protocol = 6, Postfix ≤ 2.5 milter_protocol = 2
-milter_protocol = 6
+milter_protocol = 6 
-
+   
 # Note:
 #    We will sign AFTER sending through AmaVIS, just befor sending out. So
 #    set 'smtpd_milters =' to an emty string here and add to localhost:10025
@@ -855,49 +968,62 @@ milter_protocol = 6
 #    If you want sign mails before sending through AmaVIS, set
 #    'smtpd_milters = local:/opendkim/opendkim.sock' here and add to
 #    localhost:10025 section in master.cf: 'smtpd_milters='
-#
+# 
-smtpd_milters = local:/opendkim/opendkim.sock, local:/opendmarc/opendmarc.sock
+smtpd_milters = $opendmarc_socket_string
-
-# Was sind non_smtpd_milters?
-#
-# non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT
-# der smtpd-Daemon sind.
-#
-# Das betrifft z. B.:
-#
-#     cleanup        Header/Content-Bereinigung
-#     qmgr           Queue-Manager
-#     lmtp / smtp    Auslieferung nach extern
-#     local          lokale Zustellung
-#
-# Das sind z. B.:
-#
-#     -  interne Bounces (MAILER-DAEMON)
-#
-#     -  Cron-Mails vom Server
-#
-#     -  Weiterleitungen, die Postfix selbst generiert
-#
-#     -  Mails, die über sendmail CLI gesendet werden
-#
-#     -  Mails, die Amavis über LMTP zurückgibt
-#
-#     -  etc.
-#
-#
-# DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
-non_smtpd_milters = local:/opendkim/opendkim.sock, local:/opendmarc/opendmarc.sock
 EOF
-   postfix_needs_restart=true
+
-   if [[ $? -eq 0 ]] ; then
-      echo_ok
-   else
-      echo_failed
-      error "$(cat $log_file)"
-   fi
 fi
 
 
+#if grep -q -E "^\s*#?\s*non_smtpd_milters\s*=" ${main_cf_file} ; then
+#
+#   ensure_dmarc_var "non_smtpd_milters"     > "${tmp_main_cf_file}"
+#   cp "${tmp_main_cf_file}" "${main_cf_file}"
+#
+#else
+#
+#      cat <<EOF >> /etc/postfix/main.cf 2> $log_file
+#
+## Was sind non_smtpd_milters?
+##
+## non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT
+## der smtpd-Daemon sind.
+##
+## Das betrifft z. B.:
+##
+##     cleanup        Header/Content-Bereinigung
+##     qmgr           Queue-Manager
+##     lmtp / smtp    Auslieferung nach extern
+##     local          lokale Zustellung
+##
+## Das sind z. B.:
+##
+##     -  interne Bounces (MAILER-DAEMON)
+##
+##     -  Cron-Mails vom Server
+##
+##     -  Weiterleitungen, die Postfix selbst generiert
+##
+##     -  Mails, die über sendmail CLI gesendet werden
+##
+##     -  Mails, die Amavis über LMTP zurückgibt
+##
+##     -  etc.
+##
+##
+## DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
+#non_smtpd_milters = $opendmarc_socket_string
+#EOF
+#fi
+#postfix_needs_restart=true
+#if [[ $? -eq 0 ]] ; then
+#   echo_ok
+#else
+#   echo_failed
+#   error "$(cat $log_file)"
+#fi
+
+
 echo ""
 
 echononl "   Enable OpenDMARC Service"

install_postfix_advanced.sh

@@ -2911,8 +2911,13 @@ fi
 cat <<EOF >> /etc/postfix/main.cf
 # Policyd-Weight
    #check_policy_service inet:127.0.0.1:12525,
+# ---------------------------------------------------------------------------------
+# DEPRECATED permit_mx_backup
+#
+# warning: support for restriction "permit_mx_backup" will be removed from Postfix;
 # permit Backup MX
-   permit_mx_backup,
+#   permit_mx_backup,
+# ---------------------------------------------------------------------------------
 # permit, if all restrictions so far passed
    permit
 
@@ -2953,8 +2958,13 @@ smtpd_relay_restrictions =
 # managed by the verify(8) server; see http://www.postfix.org/ADDRESS_VERIFICATION_README.html
 # for more details
    reject_unverified_recipient,
+# ---------------------------------------------------------------------------------
+# DEPRECATED permit_mx_backup
+#
+# warning: support for restriction "permit_mx_backup" will be removed from Postfix;
 # permit Backup MX
-   permit_mx_backup,
+#   permit_mx_backup,
+# ---------------------------------------------------------------------------------
 # permit, if all restrictions so far passed
    permit
 
@@ -2994,7 +3004,7 @@ if [[ -n "$(which opendkim)" ]]  || [[ -n "$(which opendmarc)" ]] ; then
 
 # ======= Milter configuration =======
 
-# OpenDKIM
+# OpenDKIM / OpenDMARC
 
 milter_default_action = accept
 
@@ -3011,7 +3021,23 @@ milter_protocol = 6
 #    localhost:10025 section in master.cf: 'smtpd_milters='
 #
 smtpd_milter_maps = cidr:/etc/postfix/smtpd_milter_map
-smtpd_milters =
+EOF
+   if [[ -n "$(which opendkim)" ]]  && [[ -n "$(which opendmarc)" ]] ; then
+      cat <<EOF >> /etc/postfix/main.cf
+smtpd_milters =  local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock
+EOF
+   elif [[ -n "$(which opendkim)" ]] ; then
+      cat <<EOF >> /etc/postfix/main.cf
+smtpd_milters = local:/opendkim/opendkim.sock
+EOF
+   else
+      cat <<EOF >> /etc/postfix/main.cf
+smtpd_milters = local:/opendmarc/opendmarc.sock
+EOF
+   fi
+
+   cat <<EOF >> /etc/postfix/main.cf
+
 # Was sind non_smtpd_milters?
 #
 # non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT 
@@ -3038,19 +3064,76 @@ smtpd_milters =
 #
 #     -  etc.
 #
-#
-EOF
-fi
-
-if [[ -n "$(which opendkim)" ]] ; then
-   cat <<EOF >> /etc/postfix/main.cf
 # DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
 #
-non_smtpd_milters = local:/opendkim/opendkim.sock
 EOF
-else
+
-   cat <<EOF >> /etc/postfix/main.cf
+   if [[ -n "$(which opendkim)" ]]  ; then
+      cat <<EOF >> /etc/postfix/main.cf
+non_smtpd_milters =  local:/opendkim/opendkim.sock
+EOF
+   else
+      cat <<EOF >> /etc/postfix/main.cf
 non_smtpd_milters =
+EOF
+   fi
+
+else
+
+   cat <<EOF >> /etc/postfix/main.cf
+
+
+# ======= Milter configuration =======
+
+# OpenDKIM / OpenDMARC
+
+milter_default_action = accept
+
+# Postfix ≥ 2.6 milter_protocol = 6, Postfix ≤ 2.5 milter_protocol = 2
+milter_protocol = 6
+
+# Note:
+#    We will sign AFTER sending through AmaVIS, just befor sending out. So
+#    set 'smtpd_milters =' to an emty string here and add to localhost:10025
+#    section in master.cf: 'smtpd_milters=local:/opendkim/opendkim.sock'
+#
+#    If you want sign mails before sending through AmaVIS, set
+#    'smtpd_milters = local:/opendkim/opendkim.sock' here and add to
+#    localhost:10025 section in master.cf: 'smtpd_milters='
+#
+smtpd_milter_maps = cidr:/etc/postfix/smtpd_milter_map
+#smtpd_milters =
+
+# Was sind non_smtpd_milters?
+#
+# non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT
+# der smtpd-Daemon sind.
+#
+# Das betrifft z. B.:
+#
+#     cleanup        Header/Content-Bereinigung
+#     qmgr           Queue-Manager
+#     lmtp / smtp    Auslieferung nach extern
+#     local          lokale Zustellung
+#
+# Das sind z. B.:
+#
+#     -  interne Bounces (MAILER-DAEMON)
+#
+#     -  Cron-Mails vom Server
+#
+#     -  Weiterleitungen, die Postfix selbst generiert
+#
+#     -  Mails, die über sendmail CLI gesendet werden
+#
+#     -  Mails, die Amavis über LMTP zurückgibt
+#
+#     -  etc.
+#
+# DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
+#
+#non_smtpd_milters =
+
 EOF
 fi
 
@@ -3541,41 +3624,58 @@ fi
 _file="/etc/postfix/header_checks.pcre"
 echononl "   Create file '$_file' used for header replacing"
 if [[ ! -f "$_file" ]]; then
-	cat << EOF > "$_file"
+	cat << 'EOF' > "$_file"
 # ---
-# - Replace headers
+# - Header Checks - /etc/postfix/header_checks
 # ---
+#
+#     Ziel: offensichtlich kaputte RFC-Header ablehnen (wenig False Positives)
 
-# - Replace recieved from
+########################################
-#/^Received: from (.* \\([-._[:alnum:]]+ \\[[.[:digit:]]{7,15}\\]\\)).*?([[:space:]]+).*\\(Authenticated sender: ([^)]+)\\)(.*)/ REPLACE Received: from [127.0.0.1] (localhost [127.0.0.1])\$2(Authenticated sender: \$3)\$4
+# A) Kaputter From:-Header
+########################################
+
+# 1) From: ist leer
+/^From:\s*$/                           REJECT Invalid From header (empty) - Spamschutzregel FROM-1001
+
+# 2) Mehr als ein '@' im From:-Header -> syntaktisch kaputt
+/^From:.*@.*@/                         REJECT Invalid From header (multiple @) - Spamschutzregel FROM-1002
 
 
-# ---
+# 3) Mehrere Mailboxen durch Komma getrennt (wie: Die@..., Lions@..., ...)
-# - Ignore Headers
+#    (Legitime Fälle nutzen i.d.R. Display-Namen/Group-Syntax; dieses Muster ist in Spam sehr häufig)
-# ---
+/^From:\s*[^<>,]+@[^,]+,\s*[^<>,]+@/   REJECT Invalid From header (multiple mailboxes) - Spamschutzregel FROM-1003
 
-#/^\s*User-Agent/        IGNORE
+# 4) Typische kaputte UTF-8-Fragmente
-#/^\s*X-Enigmail/        IGNORE
+/^From:.*\xC3\xA2/                     REJECT Invalid UTF-8 in From header - Spamschutzregel FROM-1004
-#/^\s*X-Mailer/          IGNORE
-#/^\s*X-Originating-IP/  IGNORE
 
 
-# ---
+########################################
-# - Reject / Discard headers
+# B) Optional: sehr spezifische lokale Blacklist
-# ---
+########################################
 
-/^To:.*<>/                    REJECT Possible SPAM Blank email address To: header - Header-Spamschutzregel T0-1001
+#/^Reply-To: .+\@inx1and1\..+/         REJECT Possible spam (local pattern)
 
-/\(envelope-from <>\)/        REJECT Possible SPAM - Header-Spamschutzregel RECIEV-1001
 
-/^Reply-To: .+\@inx1and1\..+/                REJECT Possible SPAM - Header-Spamschutzregel REPLY-1001
+########################################
+# C) Warn
+########################################
 
-/^From:.*<>/                             REJECT Possible SPAM - Header-Spamschutzregel FROM-1001
+# Date-Rejects sind oft zu aggressiv -> wenn nötig: lieber taggen oder loggen statt reject
+/^Date: .* 19[0-9][0-9]/               WARN Date far in the past Header-Spamschutzregel DATE-1001
+/^Date: .* 200[0-9]/                   WARN Date far in the past Header-Spamschutzregel DATE-1002
+/^Date: .* 201[0-9]/                   WARN Date far in the past Header-Spamschutzregel DATE-1003
+
+
+
+########################################
+# Bemerkungen
+########################################
+
+# (envelope-from <>) nicht pauschal rejecten:
+# echte DSNs/Bounces haben legitimerweise MAIL FROM: <>
+#/\(envelope-from <>\)/                REJECT Null envelope-from
 
-/^Date: .* 19[0-9][0-9]/      REJECT Date from the past. Fix your system clock. - Header-Spamschutzregel DATE-1001
-/^Date: .* 200[0-9]/          REJECT Date from the past. Fix your system clock. - Header-Spamschutzregel DATE-1002
-/^Date: .* 201[0-9]/          REJECT Date from the past. Fix your system clock. - Header-Spamschutzregel DATE-1003
-/^Date: .* 2020/              REJECT Date from the past. Fix your system clock. - Header-Spamschutzregel DATE-1004
 EOF
 	if [[ $? -eq 0 ]] ; then
 		echo_ok

install_postfixadmin.sh

@@ -187,10 +187,9 @@ detect_mysql_version () {
 # -
 systemd_supported=false
 
-systemd=$(which systemd)
 systemctl=$(which systemctl)
 
-if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
+if [[ -n "$systemctl" ]] ; then
    systemd_supported=true
 fi
 
@@ -256,6 +255,14 @@ do
       echo -e "\n\t\033[33m\033[1mA version number is required!\033[m\n"
    fi
 done
+
+IFS='.' read -r PF_ADMIN_MAJOR_VERSION PF_ADMIN_MINOR_VERSION  PF_ADMIN_PATCH_LEVEL <<< "$PF_ADMIN_VERSION"
+#echo ""
+#echo "PF_ADMIN_MAJOR_VERSION: $PF_ADMIN_MAJOR_VERSION"
+#echo "PF_ADMIN_MINOR_VERSION: $PF_ADMIN_MINOR_VERSION"
+#echo "PF_ADMIN_PATCH_LEVEL:   $PF_ADMIN_PATCH_LEVEL"
+#exit
+
 echo ""
 echo -e "\033[32m--\033[m"
 echo ""
@@ -275,6 +282,9 @@ DEFAULT_APACHE_SERVER_CERT="server-bundle.crt"
 DEFAULT_APACHE_SERVER_KEY="server.key"
 DEFAULT_DEBIAN_APACHE_VHOST_DIR="/etc/apache2/sites-available"
 DEFAULT_APACHE_VHOST_DIR="/usr/local/apache2/conf/vhosts"
+
+DEFAULT_COMPOSER="/usr/local/bin/composer"
+
 DEFAULT_POSTFIX_DB_HOST_PGSQL="/run/postgresql"
 if [[ -S "/tmp/mysql.sock" ]] ; then
    DEFAULT_POSTFIX_DB_HOST_MYSQL="unix:/tmp/mysql.sock"
@@ -379,6 +389,8 @@ if [[ -z "$APACHE_VHOST_DIR" ]] ; then
    fi
 fi
 
+[[ -n "${COMPOSER}" ]] || COMPOSER=${DEFAULT_COMPOSER} 
+
 [[ -n "$POSTFIX_DB_TYPE" ]] || fatal "Database Type of Postfix Database (POSTFIX_DB_TYPE) not present!"
 [[ -n "$POSTFIX_DB_HOST_MYSQL" ]] || POSTFIX_DB_HOST_MYSQL="$DEFAULT_POSTFIX_DB_HOST_MYSQL"
 [[ -n "$POSTFIX_DB_HOST_PGSQL" ]] ||POSTFIX_DB_HOST_PGSQL="$DEFAULT_POSTFIX_DB_HOST_PGSQL"
@@ -926,11 +938,79 @@ done
 if $_failed ; then
    echo_failed
    error "$(cat $log_file)"
+
+   echononl "\tcontinue anyway [yes/no]: "
+   read OK
+   OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+   while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+      echononl "Wrong entry! - repeat [yes/nno]: "
+      read OK
+   done
+   [[ $OK = "yes" ]] || fatal "Script terminated by user input.."
+
 else
    echo_ok
 fi
 
 
+echo -e "\n\n\t\033[37m\033[1mInstall (global) composer..\033[m\n"
+
+echononl "\tDownload composer from 'getcomposer.org'.."
+php -r "copy('https://getcomposer.org/installer', '${_src_base_dir}/composer-setup.php');" > $log_file 2>&1
+if [[ "$?" = "0" ]]; then
+   echo_ok
+else
+   echo_failed
+   error "$(cat $log_file)"
+
+   echononl "\tcontinue anyway [yes/no]: "
+   read OK
+   OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+   while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+      echononl "Wrong entry! - repeat [yes/nno]: "
+      read OK
+   done
+   [[ $OK = "yes" ]] || fatal "Script terminated by user input.."
+fi
+
+echononl "\tInstall composer to ${COMPOSER}"
+php ${_src_base_dir}/composer-setup.php --install-dir=$(dirname ${COMPOSER}) \
+   --filename=$(basename ${COMPOSER}) > $log_file 2>&1
+if [[ "$?" = "0" ]]; then
+   echo_ok
+else
+   echo_failed
+   error "$(cat $log_file)"
+
+   echononl "\tcontinue anyway [yes/no]: "
+   read OK
+   OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+   while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+      echononl "Wrong entry! - repeat [yes/nno]: "
+      read OK
+   done
+   [[ $OK = "yes" ]] || fatal "Script terminated by user input.."
+fi
+
+echononl "\tRemove the installer"
+php -r "unlink('${_src_base_dir}/composer-setup.php');" > $log_file 2>&1
+if [[ "$?" = "0" ]]; then
+   echo_ok
+else
+   echo_failed
+   error "$(cat $log_file)"
+
+   echononl "\tcontinue anyway [yes/no]: "
+   read OK
+   OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+   while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+      echononl "Wrong entry! - repeat [yes/nno]: "
+      read OK
+   done
+   [[ $OK = "yes" ]] || fatal "Script terminated by user input.."
+fi
+
+
    
 echo -e "\n\n\t\033[37m\033[1mBase install Postfixadmin..\033[m\n"
 
@@ -1102,6 +1182,37 @@ else
    echo_ok
 fi
 
+echononl "\tInstall PHP dependencies ( composer install --no-dev ... ).."
+if [[ ${PF_ADMIN_MAJOR_VERSION} -gt 3 ]] ; then
+   if $PHP_DEBIAN_INSTALLATION ; then
+      su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}
+         php /usr/local/bin/composer install --prefer-dist --no-interaction --no-dev" -s /bin/bash \
+         > $log_file 2>&1
+   else
+      su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}
+         /usr/local/php-${php_latest_ver}/bin/php /usr/local/bin/composer --prefer-dist \
+            --no-interaction install --no-dev" -s /bin/bash > $log_file 2>&1
+   fi
+   if [[ $? -eq 0 ]]; then
+         echo_ok
+   else
+      echo_failed
+      error "$(cat $log_file)"
+
+      echononl "\tcontinue anyway [yes/no]: "
+      read OK
+      OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
+      while [[ "$OK" != "yes" ]] && [[  "$OK" != "no" ]] ; do
+         echononl "Wrong entry! - repeat [yes/nno]: "
+         read OK
+      done
+      [[ $OK = "yes" ]] || fatal "Script terminated by user input.."
+   fi
+else
+   echo_skipped
+fi
+
+
 
 echononl "\tRemove existing symlink '${WEBSITE_BASEDIR}/htdocs'"
 if [[ -h "${WEBSITE_BASEDIR}/htdocs" ]]; then
@@ -2097,7 +2208,7 @@ fi
 
 echo -e "\n\n\t\033[37m\033[1mConfigure Postfix Admin\033[m\n"
 
-if [[ $MAJOR_VERSION -eq 3 ]] && [[ $MINOR_VERSION -gt 0 ]]; then
+if [[ $MAJOR_VERSION -gt 3 ]] || [[ $MAJOR_VERSION -eq 3 ]] && [[ $MINOR_VERSION -gt 0 ]]; then
    pfa_conf_file="${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.local.php"
    cp -a "${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.inc.php"  "$pfa_conf_file"
 else
@@ -2496,7 +2607,7 @@ fi
 ## -    $CONF['show_undeliverable']='NO';
 ## -    $CONF['show_popimap']='NO';
 ## -
-## -    $CONF['used_quotas'] = 'YES';
+## -    $CONF['used_quotas'] = 'NO';
 ## -    $CONF['new_quota_table'] = 'YES';
 ## -
 echononl "\tAdjust Postfix Admin's Configuration - Part 5"
@@ -2528,7 +2639,7 @@ perl -i -n -p -e "s#^(\s*\\\$CONF\['show_undeliverable'\]\s*=.*)#//!\1\n\\\$CONF
   $pfa_conf_file >> $log_file 2>&1 || _failed=true 
 perl -i -n -p -e "s#^(\s*\\\$CONF\['show_popimap'\]\s*=.*)#//!\1\n\\\$CONF['show_popimap'] = 'NO';#" \
   $pfa_conf_file >> $log_file 2>&1 || _failed=true 
-perl -i -n -p -e "s#^(\s*\\\$CONF\['used_quotas'\]\s*=.*)#//!\1\n\\\$CONF['used_quotas'] = 'YES';#" \
+perl -i -n -p -e "s#^(\s*\\\$CONF\['used_quotas'\]\s*=.*)#//!\1\n\\\$CONF['used_quotas'] = 'NO';#" \
   $pfa_conf_file >> $log_file 2>&1 || _failed=true 
 perl -i -n -p -e "s#^(\s*\\\$CONF\['new_quota_table'\]\s*=.*)#//!\1\n\\\$CONF['new_quota_table'] = 'YES';#" \
   $pfa_conf_file >> $log_file 2>&1 || _failed=true 
@@ -3496,6 +3607,26 @@ else
    error "$(cat $log_file)"
 fi
 
+
+
+echononl "\tRestart Apache Webservice.."
+if [[ -n "$APACHE_SERVICE_FILE" ]] ||  [[ -n "$APACHE_INIT_SCRIPT" ]] ; then
+	if [[ -n "$APACHE_SERVICE_FILE" ]] ; then
+		systemctl restart $APACHE_SERVICE_FILE > $log_file 2>&1
+	else
+		$APACHE_INIT_SCRIPT restart > $log_file 2>&1
+	fi
+	if [[ $? -eq 0 ]]; then
+		echo_ok
+	else
+		echo_failed
+		error "$(cat $log_file)"
+	fi
+else
+	echo_skipped
+	warn "Neither an init-script nor a service file for 'apache2' webservice  found!"
+fi
+
 # - Start all PHP FPM engines
 # -
 if [[  -n "$php_major_versions" ]]; then
@@ -3543,7 +3674,7 @@ fi
 
 
 echo ""
-info "Browse to \033[1mhttp://${WEBSITE_NAME}/setup.php\033[m to create a 'setup password'\n$(cat <<EOF
+info "Browse to \033[1mhttps://${WEBSITE_NAME}/setup.php\033[m to create a 'setup password'\n$(cat <<EOF
 
 \t          \033[33mIn caes of updating postfix.admin browse this URL and \033[1mlogin with your
 \t          setup_password\033[m\033[33m, because only after that the database '${POSTFIX_DB_NAME}'

install_update_dovecot-2.4.sh

@@ -2361,7 +2361,13 @@ done
 
 ## - Let make use multiple cores (-j<number of cores +1>)
 ## -
-export MAKEFLAGS=-j$(expr `grep  "^processor" /proc/cpuinfo | sort -u | wc -l` - 1)
+#export MAKEFLAGS=-j$(expr `grep  "^processor" /proc/cpuinfo | sort -u | wc -l` - 1)
+CPUS=$(nproc)
+if (( CPUS > 1 )); then
+    export MAKEFLAGS="-j$((CPUS - 1))"
+else
+    export MAKEFLAGS="-j1"
+fi
 
 
 # -------------
@@ -6562,7 +6568,7 @@ EOF
 
    elif [[ "$db_driver" = "mysql" ]]; then
 
-      read -r -d '' NEW_BLOCK <<'EOF'
+      read -r -d '' NEW_BLOCK <<EOF
 passdb sql {
 
    # Load SQL connection data

install_update_dovecot.sh

@@ -184,7 +184,7 @@ else
 fi
 
 if [[ -z "$systemd_support" ]] ; then
-   if $SYSTEMD_EXISTS ; then 
+   if $SYSTEMD_EXISTS ; then
       systemd_support=true
    else
       systemd_support=false
@@ -305,7 +305,7 @@ _version_short="${_version%-*}"
 #clean_up 0
 
 
-# 'expire plugin'was rRemoved in version 2.3.14: This plugin is not needed. 
+# 'expire plugin'was rRemoved in version 2.3.14: This plugin is not needed.
 # Use mailbox { autoexpunge } Mailbox settings instead.
 #
 if [[ $dovecot_major_version -gt 2 ]] \
@@ -362,12 +362,12 @@ if [[ -n "$_update" ]]; then
       echo -e "[1] Update"
       echo -e "\033[37m\033[1m[2] New Installation\033[m"
    fi
-   echo "" 
+   echo ""
    echononl "Choose a number or press <RETURN> for highlighted value: "
 else
    echo -e "[1] Update"
    echo "[2] New Installation"
-   echo "" 
+   echo ""
    echononl "Choose a Number: "
 fi
 update=""
@@ -392,13 +392,13 @@ while [[ "$update" != "true" && "$update" != "false" ]] ; do
          fi
          ;;
       *) update=""
-         echo ""   
+         echo ""
          if [[ -n "$_IS_RELAY_HOST" ]]; then
             echo -e "\tWrong entry! [ 1 = Update ; 2 = New Installation ] or type <RETURN>"
          else
-            echo -e "\tWrong entry! [ 1 = Update ; 2 = New Installation ]" 
+            echo -e "\tWrong entry! [ 1 = Update ; 2 = New Installation ]"
          fi
-         echo "" 
+         echo ""
          echononl "Reentry: "
          ;;
    esac
@@ -415,7 +415,7 @@ done
 clear;
 
 echo ""
-if $update ;then 
+if $update ;then
    echo -e   "\tUpdate Dovecot................: $update"
 else
    echo -e   "\tInstall Dovecot first time....: Yes"
@@ -507,7 +507,7 @@ export MAKEFLAGS=-j$(expr `grep  "^processor" /proc/cpuinfo | sort -u | wc -l` -
 
 echo ""
 
-if $update ;then 
+if $update ;then
    _new=false;
 else
    _new=true;
@@ -683,7 +683,7 @@ mkdir -p $_log_dir
 
 
 ## -----------------
-## --- Download 
+## --- Download
 
 cd ${_src_base_dir}
 
@@ -720,7 +720,7 @@ fi
 ## - Download Pigeonhole for Dovecot v2.2
 ## -
 if [[ ${dovecot_major_version} -eq 2 ]] && [[ ${dovecot_minor_version} -lt 4 ]] ; then
-   
+
    echononl "\tDownload dovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz.."
    if [ ! -f "${_src_base_dir}/dovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz" ]; then
       wget --no-check-certificate https://pigeonhole.dovecot.org/releases/${dovecot_main_version}/dovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz > /dev/null 2>&1
@@ -730,7 +730,7 @@ if [[ ${dovecot_major_version} -eq 2 ]] && [[ ${dovecot_minor_version} -lt 4 ]]
          echo -e "$rc_failed"
          error "Direct download of 'dovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz' failed
 
-                     Download \033[1mdovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz\033[m manually 
+                     Download \033[1mdovecot-${dovecot_main_version}-pigeonhole-${_pigeonhole}.tar.gz\033[m manually
                      and proceed instllation."
 
          echononl "\tProceed instllation [yes/no]: "
@@ -1071,7 +1071,7 @@ fi
 ## -    if [ -d $checkdir ]; then
 ## -       PATH=$PATH:$checkdir
 ## -    fi
-## - 
+## -
 echononl "\tAdd /usr/local/dovecot/bin to PATH variable.."
 if ! grep "checkdir=\"/usr/local/dovecot/bin\"" /etc/profile  > /dev/null ; then
    perl -i -n -p -e "s#^(\s*)(export\ +PATH)#checkdir=\"/usr/local/dovecot/bin\"\nif [ -d \\\$checkdir ]; then\n   PATH=\\\$PATH:\\\$checkdir\nfi\n\n\1\2#" /etc/profile
@@ -1166,9 +1166,9 @@ cp -r /usr/local/dovecot-${_version}/share/doc/dovecot/example-config/* \
 ## -   base_dir =/run/dovecot/
 ## -   state_dir = /run/dovecot
 ## -   shutdown_clients = no
-## -   
+## -
 ## -   dict {
-## -     expire = $db_driver:/usr/local/dovecot/etc/dovecot/sql-dict.conf.ext 
+## -     expire = $db_driver:/usr/local/dovecot/etc/dovecot/sql-dict.conf.ext
 ## -   }
 ## -
 echononl "\tAdjust file dovecot.conf.."
@@ -1253,7 +1253,7 @@ if $_new ; then
       echononl "\tCreate table expires in database ${dbname}.."
       if $plugin_expire ; then
          cat << EOF | psql -U$dbuser $dbname > ${_log_dir}/error.log 2>&1
- 
+
 CREATE TABLE IF NOT EXISTS expires (
   username varchar(100) not null,
   mailbox varchar(255) not null,
@@ -1395,7 +1395,7 @@ EOF
       echononl "\tCreate table expires in database ${dbname}.."
       if $plugin_expire ; then
          cat << EOF | mysql -u$dbuser -p$dbpassword $dbname > /dev/null 2>&1
- 
+
 CREATE TABLE IF NOT EXISTS expires (
   username varchar(100) not null,
   mailbox varchar(255) not null,
@@ -1450,7 +1450,7 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #   END IF;
 # END;
 # \$\$ LANGUAGE plpgsql;
-# 
+#
 # CREATE TRIGGER mergeexpires BEFORE INSERT ON expires
 #    FOR EACH ROW EXECUTE PROCEDURE merge_expires();
 
@@ -1505,7 +1505,7 @@ EOF
          echo -e "$rc_failed"
          fatal "Creating file sql-dict.conf.ext failed"
       fi
-   fi   
+   fi
 else
    echo -e "$rc_skipped"
 fi
@@ -1519,15 +1519,15 @@ fi
 ## -    default_vsz_limit = 512M
 ## -
 ## - !! Bemerkung !!
-## - 
+## -
-## - Das Hochsetzen des default_client_limit Parameters auf einen Wert größer 
+## - Das Hochsetzen des default_client_limit Parameters auf einen Wert größer
-## - als 1024 geht nur dann wenn auch die Anzahl der zulässigen "open files" 
+## - als 1024 geht nur dann wenn auch die Anzahl der zulässigen "open files"
-## - (default = 1024) geändert wird. 
+## - (default = 1024) geändert wird.
 ## -
 ## -
 ## - Systemd System:
 ## - ===============
-## - 
+## -
 ## - In der service datei (z.Bsp. /etc/systemd/system/multi-user.target.wants/dovecot.service)
 ## - den Wert 'LimitNOFILE' hochsetzen:
 ## -
@@ -1536,15 +1536,15 @@ fi
 ## -    systemctl daemon-reload
 ## -    systemctl restart dovecot.service
 ## -
-## - Im Falle von LX containern muss zusätzlich auf dem hostsystem 
+## - Im Falle von LX containern muss zusätzlich auf dem hostsystem
-## - in der datei '/etc/systemd/system.conf' der Wert für 'DefaultLimitNOFILE' 
+## - in der datei '/etc/systemd/system.conf' der Wert für 'DefaultLimitNOFILE'
 ## - hochgesetzt werden.
 ## -
 ## - System V systems:
 ## - =================
-## - Das Hochsetzen des default_client_limit Parameters auf einen Wert größer 
+## - Das Hochsetzen des default_client_limit Parameters auf einen Wert größer
-## - als 1024 geht nur dann wenn auch die Anzahl der zulässigen "open files" 
+## - als 1024 geht nur dann wenn auch die Anzahl der zulässigen "open files"
-## - (default = 1024) geändert wird. Z.Bsp. in der Datei /etc/init.d/dovecot 
+## - (default = 1024) geändert wird. Z.Bsp. in der Datei /etc/init.d/dovecot
 ## - durch Einfügen der zeile:
 ## -    ulimit -n 32768
 ## -
@@ -1596,10 +1596,10 @@ fi
 ## -        address = $imaps_listener_adresses
 ## -        ..
 ## -      }
-## -      
+## -
 ## -      process_min_avail = 16
 ## -    }
-## -    
+## -
 ## -    service pop3-login {
 ## -      inet_listener pop3 {
 ## -        address = $pop_listener_adresses
@@ -1678,7 +1678,7 @@ fi
 ## - permanently on filesystem. So we have to create such a file
 ## -
 ## -    openssl dhparam -out /etc/postfix/ssl/dh_4096.pem`
-## - 
+## -
 if [[ $dovecot_major_version -ge 3 ]] \
    || ( [[ $dovecot_major_version -eq 2 ]] && [[ $dovecot_minor_version -ge 3 ]] ); then
 
@@ -1687,7 +1687,7 @@ if [[ $dovecot_major_version -ge 3 ]] \
       echo -en "$rc_wait"
       if [[ "$os_dist" = "debian" ]] && [[ $os_version -gt 11 ]] ; then
          openssl dhparam -out "$dh_pem_file" 4096 > /dev/null 2>&1
-      else 
+      else
          openssl dhparam -dsaparam -out "$dh_pem_file" 4096 > /dev/null 2>&1
       fi
 		if [[ $? -eq 0 ]]; then
@@ -1784,7 +1784,7 @@ fi
 
 
 ## - edit /usr/local/dovecot/etc/dovecot/conf.d/10-mail.conf
-## - 
+## -
 ## -    mail_location = maildir:/var/vmail/%d/%n/Maildir
 ## -
 ## -    mail_uid = vmail
@@ -1794,7 +1794,7 @@ fi
 ## -    last_valid_uid = 5000
 ## -
 ## -    mail_temp_dir = /var/vmail/tmp
-## -    
+## -
 ## -    first_valid_gid = 5000
 ## -    last_valid_gid = 5000
 ## -
@@ -1842,7 +1842,7 @@ else
    echo -e "$rc_failed"
    fatal "Adjusting file '10-mail.conf' failed"
 fi
-   
+
 
 
 echononl "\tCreate TEMP directory '/var/vmail/tmp' .."
@@ -1937,7 +1937,7 @@ fi
 ## -
 ## - Add namespaces type private
 ## -
-## - Add: 
+## - Add:
 ## -    namespace inbox {
 ## -       type = private
 ## -       separator = /
@@ -1957,7 +1957,7 @@ namespace inbox {
   # Hierarchy separator to use. You should use the same separator for all
   # namespaces or some clients get confused. '/' is usually a good one.
   # The default however depends on the underlying mail storage format.
-  #separator = 
+  #separator =
   separator = /
 
   # Prefix required to access this namespace. This needs to be different for
@@ -2007,12 +2007,12 @@ fi
 ## -       auto = subscribe
 ## -       special_use = \Drafts
 ## -     }
-## -   
+## -
 ## -     mailbox Trash {
 ## -       auto = subscribe
 ## -       special_use = \Trash
 ## -     }
-## -   
+## -
 ## -     mailbox Sent {
 ## -       auto = subscribe
 ## -       special_use = \Sent
@@ -2072,7 +2072,7 @@ fi
 ## -
 ## -    disable_plaintext_auth = no
 ## -    auth_mechanisms = $auth_mechanisms
-## -    !include auth-sql.conf.ext  # comment all other includes 
+## -    !include auth-sql.conf.ext  # comment all other includes
 ## -    auth_username_translation = "%@"
 ## -
 _failed=false
@@ -2101,14 +2101,14 @@ fi
 ## -
 ## -    passdb {
 ## -      driver = sql
-## -    
+## -
-## -    
+## -
 ## -      # path for sql configuration file, see example-config/dovecot-sql.conf.ext
 ## -      args = /usr/local/dovecot/etc/dovecot/sql-connect.conf.ext
 ## -    }
-## -    
+## -
 ## -    ..
-## -    
+## -
 ## -    userdb {
 ## -      driver = sql
 ## -      args = /usr/local/dovecot/etc/dovecot/sql-connect.conf.ext
@@ -2194,14 +2194,14 @@ fi
 ## - if running inetd-script:
 ## -
 ## -    log_path = /var/log/dovecot/dovecot.log
-## -    
+## -
 ## - or for example
 ## -
 ## -    log_path = syslog
 ## -    syslog_facility = local1
 ## -    auth_verbose = yes
 ## -    auth_verbose_passwords = plain
-## - 
+## -
 ## - in conjunction with the the following entries in /etc/rsyslog.conf
 ## -
 ## -    local1.*                          -/var/log/dovecot.log
@@ -2310,7 +2310,7 @@ fi
 ## -    hostname = $hostname
 ## -    sendmail_path = /usr/sbin/sendmail
 ## -    lda_mailbox_autocreate = no
-## -    mail_plugins = $mail_plugins sieve 
+## -    mail_plugins = $mail_plugins sieve
 ## -
 _failed=false
 echononl "\tAdjusting file 15-lda.conf"
@@ -2406,7 +2406,7 @@ fi
 ## - edit /usr/local/dovecot/etc/dovecot/conf.d/90-plugin.conf
 ## -
 ## - Note:
-## -    Setting "autocreate", "autosubscribe" here is depricated. Use mailbox { auto } setting instead. 
+## -    Setting "autocreate", "autosubscribe" here is depricated. Use mailbox { auto } setting instead.
 ## -
 ## -      expire = Trash
 ## -      expire2 = Trash/*
@@ -2419,7 +2419,7 @@ fi
 ## -      # it's better to enable it only after you've verified that the expire plugin is
 ## -      # working as wanted. (v2.2.16+)
 ## -      expire_cache = yes
-## -    
+## -
 _failed=false
 echononl "\tAdjusting file 90-plugin.conf"
 if $plugin_expire ; then
@@ -2483,7 +2483,7 @@ while IFS='' read -r _line || [[ -n $_line ]] ; do
 
       cat <<EOF >> "$_tmp_file"
 
-  # Add Setting 'sieve_vacation_send_from_recipient' from (included) 
+  # Add Setting 'sieve_vacation_send_from_recipient' from (included)
   #
   #    Pigeonhole Sieve: Vacation Extension
   #    ====================================
@@ -2563,7 +2563,7 @@ else
 
 fi
 
-## - NOTICE: if you pre-compile your (global) scripts, you will increase 
+## - NOTICE: if you pre-compile your (global) scripts, you will increase
 ## -         performance
 ## -
 echononl "\tPrecompile global sieve script"
@@ -2597,12 +2597,14 @@ chown -R vmail:vmail /usr/local/dovecot-${_version}/etc/dovecot/sieve
 
 if $systemd_support; then
 
+   _folder_created=false
+
    ## - # - At time, we don't use private tmp directory for divecot.
    ## - # -
    ## - echononl "\tAdjust Systemd service file, set PrivateTmp=false.."
    ## - if [[ -f "/etc/systemd/system/dovecot.service" ]] ; then
-   ## - 
+   ## -
-   ## -    if $(grep -o -E "PrivateTmp\s*=\s*[^[:blank:]]+" /etc/systemd/system/dovecot.service | grep -q true 2> /dev/null ) ; then 
+   ## -    if $(grep -o -E "PrivateTmp\s*=\s*[^[:blank:]]+" /etc/systemd/system/dovecot.service | grep -q true 2> /dev/null ) ; then
    ## -       perl -i -n -p -e "s/(PrivateTmp\s*=\s*)true/\1false/" /etc/systemd/system/dovecot.service
    ## -       if [[ $? -eq 0 ]]; then
    ## -          echo -e "$rc_done"
@@ -2620,9 +2622,16 @@ if $systemd_support; then
    ## -
    ## - here:
    ## -    LimitNOFILE=32768
-   ## - 
+   ## -
-   if [[ -f "/lib/systemd/system/dovecot.service" ]] \
+   ## - zwei Bemerkungen:
-      && $(grep -q -E "^LimitNOFILE=" /lib/systemd/system/dovecot.service) ; then 
+   ## -     - keine runden Klammern notwendig, da die bash '&&' vor '||' auswertet
+   ## -     - hier auch keine backslah '\' am ende der zeile notwendig, da statement
+   ## -       offensichtlich noch nichzt abgeschlossen ist (die bash erkennt das)
+   ## -
+   if [[ -f /lib/systemd/system/dovecot.service ]] &&
+      grep -qE '^[[:space:]]*LimitNOFILE=' /lib/systemd/system/dovecot.service ||
+      [[ -f /etc/systemd/system/dovecot.service ]] &&
+      grep -qE '^[[:space:]]*LimitNOFILE=' /etc/systemd/system/dovecot.service ; then
 
       _LimitNOFILE="$(grep -E "^LimitNOFILE=[[:digit:]]+" /lib/systemd/system/dovecot.service | cut -d'=' -f2)"
 
@@ -2638,6 +2647,7 @@ if $systemd_support; then
             mkdir "/etc/systemd/system/dovecot.service.d" > /dev/null 2>&1
             if [[ $? -eq 0 ]]; then
                echo -e "$rc_done"
+               _folder_created=true
             else
                echo -e "$rc_failed"
                adjust_limit_nofile=false
@@ -2656,8 +2666,54 @@ LimitNOFILE=$service_limit_nofile
 EOF
          echo -e "$rc_done"
       fi
+
    fi
 
+   ## - Adjust systemd hardening:
+   ## -
+   ## - Options such as ProtectSystem=full/strict make the service's mount namespace,
+   ## - including /usr (and thus /usr/local/dovecote/..), read-only, even though it is w
+   ## - ritable outside the service.
+   ## -
+   ## - However, we would like to allow dovecot to write to the directory
+   ## - /usr/local/dovecot/etc/dovecot/sieve/.
+   ## -
+   ## -    ProtectSystem=off
+   ## -
+   ## - zwei Bemerkungen:
+   ## -     - keine runden Klammern notwendig, da die bash '&&' vor '||' auswertet
+   ## -     - hier auch keine backslah '\' am ende der zeile notwendig, da statement
+   ## -       offensichtlich noch nichzt abgeschlossen ist (die bash erkennt das)
+   ## -
+   if [[ -f /lib/systemd/system/dovecot.service ]] &&
+      grep -qE '^[[:space:]]*ProtectSystem=' /lib/systemd/system/dovecot.service ||
+      [[ -f /etc/systemd/system/dovecot.service ]] &&
+      grep -qE '^[[:space:]]*ProtectSystem=' /etc/systemd/system/dovecot.service ; then
+
+      if ! ${_folder_created} ; then
+
+         echononl "\tCreate Directory '/etc/systemd/system/dovecot.service.d'.."
+         if [[ -d "/etc/systemd/system/dovecot.service.d" ]] ; then
+            echo -e "$rc_skipped"
+         else
+            mkdir "/etc/systemd/system/dovecot.service.d" > /dev/null 2>&1
+            if [[ $? -eq 0 ]]; then
+               echo -e "$rc_done"
+            else
+               echo -e "$rc_failed"
+            fi
+         fi
+
+      fi
+
+      echononl "\tSet 'ProtectSystem=off' for 'dovecot.service'.."
+      cat <<EOF > /etc/systemd/system/dovecot.service.d/systemd-hardening.conf
+[Service]
+ProtectSystem=off
+EOF
+         echo -e "$rc_done"
+
+   fi
 
    echononl "\tReload systemd .."
    systemctl daemon-reload > /dev/null 2>&1
@@ -2692,7 +2748,7 @@ else
    fi
 
 fi
- 
+
 
 if $_new ; then
 
@@ -2707,7 +2763,7 @@ if $_new ; then
          ## - running dovecot service via init-script
          ## -
          cat <<EOF > /etc/init.d/dovecot
-#! /bin/sh 
+#! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          dovecot
 # Required-Start:    \$syslog \$postgresql
@@ -2899,7 +2955,7 @@ EOF
             echo -e "$rc_failed"
             fatal "Creating init script for dovecot failed"
          fi
-         
+
          chmod 755 /etc/init.d/dovecot
 
       else
@@ -2910,7 +2966,7 @@ EOF
    fi
 
    ## - Add a cronjob to restart dovecot after booting the system.
-   ## - 
+   ## -
    ## - Notice:
    ## - On normal start, dovecot started its service even if ipv6 is not
    ## - yet present and dovecot cannot bind to ipv6 listeners.
@@ -2964,10 +3020,10 @@ EOF
    ## - add/uncomment:
    ## -
    ## -    smtpd_tls_auth_only
-   ## - 
+   ## -
    ## -    smtpd_sasl_type = dovecot
    ## -    smtpd_sasl_path = private/dovecot-auth
-   ## - 
+   ## -
    ## -    virtual_transport = dovecot
    ## -    dovecot_destination_recipient_limit = 1
    ## -
@@ -3172,22 +3228,22 @@ echo -e "\033[1mConfigure quota support for dovecot\033[m"
 
 ## - take care quota plugins (quota,imap-quota) will
 ## - be loaded:
-## - 
+## -
 ## -    there are two quota related plugins:
-## -    
+## -
 ## -        * quota: implements the actual quota handling and includes also all the quota backends.
-## -        * imap_quota: for reporting quota information via imap. 
+## -        * imap_quota: for reporting quota information via imap.
-## -    
+## -
 ## -    enable them in configuration files, e.g.:
-## -    
+## -
 ## -    conf.d/10-mail.conf:
-## -    
+## -
 ## -    # space separated list of plugins to load for all services. plugins specific to
 ## -    # imap, lda, etc. are added to this list in their own .conf files.
 ## -    mail_plugins = $mail_plugins quota
-## -    
+## -
 ## -    conf.d/20-imap.conf:
-## -    
+## -
 ## -    protocol imap {
 ## -      # space separated list of plugins to load (default is global mail_plugins).
 ## -      mail_plugins = $mail_plugins imap_quota
@@ -3222,7 +3278,7 @@ fi
 
 
 ## - edit /usr/local/dovecot/etc/dovecot/dovecot.conf
-## - 
+## -
 ## - add:
 ## -
 ## -    dict {
@@ -3369,7 +3425,7 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #                 END IF;
 #                 return NEW;
 #             END IF;
-# 
+#
 #             LOOP
 #                 UPDATE quota2 SET bytes = bytes + NEW.bytes,
 #                     messages = messages + NEW.messages
@@ -3377,7 +3433,7 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #                 IF found THEN
 #                     RETURN NULL;
 #                 END IF;
-# 
+#
 #                 BEGIN
 #                     IF NEW.messages = 0 THEN
 #                     INSERT INTO quota2 (bytes, messages, username) VALUES (NEW.bytes, NULL, NEW.username);
@@ -3391,10 +3447,10 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #             END LOOP;
 #         END;
 #         \$\$;
-# 
+#
-# 
+#
 # ALTER FUNCTION public.merge_quota2() OWNER TO postfix;
-# 
+#
 # CREATE TRIGGER mergequota2
 #     BEFORE INSERT ON quota2
 #     FOR EACH ROW
@@ -3444,7 +3500,7 @@ EOF
 #   END IF;
 # END;
 # \$\$ LANGUAGE plpgsql;
-# 
+#
 # CREATE TRIGGER mergeexpires BEFORE INSERT ON expires
 #    FOR EACH ROW EXECUTE PROCEDURE merge_expires();
 
@@ -3473,7 +3529,7 @@ EOF
    fi
 
    ## - you also have to update the userdb's query in file
-   ## - "/usr/local/dovecot/etc/dovecot/sql-connect.conf.ext" to 
+   ## - "/usr/local/dovecot/etc/dovecot/sql-connect.conf.ext" to
    ## - support extra variable "quota_rule"
    ## -
    echononl "\tRenew file sql-connect.conf.ext"
@@ -3570,7 +3626,7 @@ EOF
    fi
 
    ## - you also have to update the userdb's query in file
-   ## - "/usr/local/dovecot/etc/dovecot/sql-connect.conf.ext" to 
+   ## - "/usr/local/dovecot/etc/dovecot/sql-connect.conf.ext" to
    ## - support extra variable "quota_rule"
    ## -
    echononl "\tRenew file sql-connect.conf.ext"
@@ -3697,20 +3753,20 @@ fi
 
 
 ## - edit /usr/local/dovecot/etc/dovecot/conf.d/90-quota.conf
-## - 
+## -
 ## - add to the end of file or in seperate plugin-blocks
 ## - as designed in that file:
 ## -    plugin {
 ## -      # sql backend:
 ## -      quota = dict:user quota::proxy::quota
-## -    
+## -
 ## -      quota_rule = *:storage=1g
 ## -      quota_rule2 = trash:storage=+100m
 ## -
 ## -      quota_warning = storage=80%% quota-warning 80 %u
 ## -      quota_warning2 = storage=95%% quota-warning 95 %u
 ## -    }
-## -    
+## -
 ## -    service quota-warning {
 ## -      executable = script /usr/local/bin/quota-warning.sh
 ## -      user = vmail
@@ -3725,7 +3781,7 @@ cp -a /usr/local/dovecot-${_version}/etc/dovecot/conf.d/90-quota.conf \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/90-quota.conf.ORIG
 cat <<EOF >>/usr/local/dovecot-${_version}/etc/dovecot/conf.d/90-quota.conf
 
-## - 
+## -
 plugin {
   # SQL backend:
   quota = dict:User quota::proxy::quota
@@ -3832,7 +3888,7 @@ fi
 ## - edit /usr/local/dovecot/etc/dovecot/conf.d/10-mail.conf
 ## -
 ## - Add namespaces type shared to 10-mail.conf
-## - Take care to enable ACL plugin also, otherwise all users can access all the shared 
+## - Take care to enable ACL plugin also, otherwise all users can access all the shared
 ## - mailboxes, assuming they have permissions on filesystem level to do so.
 ## - we will do that later..
 ## -    namespace {
@@ -3894,7 +3950,7 @@ else
 fi
 
 ## - edit /usr/local/dovecot/etc/dovecot/conf.d/10-mail.conf
-## - 
+## -
 ## -    mail_plugins = quota expire acl
 ## -
 _failed=false
@@ -3961,7 +4017,7 @@ fi
 ## -
 ## -    plugin {
 ## -      ## acl = vfile:/etc/dovecot/global-acls:cache_secs=300
-## - 
+## -
 ## -      # Without global ACLs:
 ## -      acl = vfile
 ## -      ..
@@ -4094,8 +4150,8 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 ## - NOTE:
 ## -
 ## - All changes on database (CREATE TABLE / CREATE TRIGGER / what else..)
-## - need to be done as the dbuser (here postfix) under whom dovecot 
+## - need to be done as the dbuser (here postfix) under whom dovecot
-## - accesses the database. If not, you have to change the permissiond to allow 
+## - accesses the database. If not, you have to change the permissiond to allow
 ## - dovecot dbuser to access the createt table/trigger/...
 ## -
 
@@ -4125,7 +4181,7 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #                 END IF;
 #                 return NEW;
 #             END IF;
-# 
+#
 #             LOOP
 #                 UPDATE quota2 SET bytes = bytes + NEW.bytes,
 #                     messages = messages + NEW.messages
@@ -4133,7 +4189,7 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #                 IF found THEN
 #                     RETURN NULL;
 #                 END IF;
-# 
+#
 #                 BEGIN
 #                     IF NEW.messages = 0 THEN
 #                     INSERT INTO quota2 (bytes, messages, username) VALUES (NEW.bytes, NULL, NEW.username);
@@ -4147,10 +4203,10 @@ connect = host=$dbhost user=$dbuser password=$dbpassword dbname=$dbname
 #             END LOOP;
 #         END;
 #         \$\$;
-# 
+#
-# 
+#
 # ALTER FUNCTION public.merge_quota2() OWNER TO postfix;
-# 
+#
 # CREATE TRIGGER mergequota2
 #     BEFORE INSERT ON quota2
 #     FOR EACH ROW
@@ -4200,7 +4256,7 @@ EOF
 #   END IF;
 # END;
 # \$\$ LANGUAGE plpgsql;
-# 
+#
 # CREATE TRIGGER mergeexpires BEFORE INSERT ON expires
 #    FOR EACH ROW EXECUTE PROCEDURE merge_expires();
 
@@ -4230,7 +4286,7 @@ EOF
 #   primary key (from_user, to_user)
 # );
 # COMMENT ON TABLE user_shares IS 'User from_user shares folders to user to_user.';
-# 
+#
 # CREATE TABLE anyone_shares (
 #   from_user varchar(100) not null,
 #   dummy char(1) DEFAULT '1',    -- always '1' currently
@@ -4336,7 +4392,7 @@ EOF
 #   dummy char(1) DEFAULT '1',    -- always '1' currently
 #   primary key (from_user, to_user)
 # ) COMMENT = 'User from_user shares folders to user to_user.';
-# 
+#
 # CREATE TABLE anyone_shares (
 #   from_user varchar(100) not null,
 #   dummy char(1) DEFAULT '1',    -- always '1' currently
@@ -4576,7 +4632,7 @@ fi
 blank_line
 echononl "\tSet '_update=true' in file '$(basename "$conf_file")'.."
 if grep -q -E "^\s*_update=false" "$conf_file" 2> /dev/null ; then
-   perl -i -n -p -e "s/^\s*_update=.*/_update=true/" "$conf_file" 
+   perl -i -n -p -e "s/^\s*_update=.*/_update=true/" "$conf_file"
    if [ "$?" = 0 ]; then
       echo -e "$rc_done"
    else