Bläddra i källkod

[Update] Remove mailcow_anonymize_headers.pcre checks
[Postfix] Rename mailcow_anonymize_headers.pcre > anonymize_headers.pcre to prevent collisions

André 6 år sedan
förälder
incheckning
93e0206db4
3 ändrade filer med 1 tillägg och 8 borttagningar
  1. 0 0
      data/conf/postfix/anonymize_headers.pcre
  2. 1 1
      data/conf/postfix/main.cf
  3. 0 7
      update.sh

+ 0 - 0
data/conf/postfix/mailcow_anonymize_headers.pcre → data/conf/postfix/anonymize_headers.pcre


+ 1 - 1
data/conf/postfix/main.cf

@@ -129,5 +129,5 @@ smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_ma
 smtp_sasl_security_options = 
 smtp_sasl_mechanism_filter = plain, login
 smtp_tls_policy_maps=proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf
-smtp_header_checks = pcre:/opt/postfix/conf/mailcow_anonymize_headers.pcre
+smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre
 mail_name = Postcow

+ 0 - 7
update.sh

@@ -254,9 +254,6 @@ sleep 2
 docker-compose down
 
 # Fix header check
-if [[ -f data/conf/postfix/mailcow_anonymize_headers.pcre ]]; then
-  mv data/conf/postfix/mailcow_anonymize_headers.pcre data/conf/postfix/mailcow_anonymize_headers.pcre_
-fi
 # Silently fixing remote url from andryyy to mailcow
 git remote set-url origin https://github.com/mailcow/mailcow-dockerized
 echo -e "\e[32mCommitting current status...\e[0m"
@@ -286,10 +283,6 @@ elif [[ ${MERGE_RETURN} != 0 ]]; then
   echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors."
   exit 1
 fi
-# Make sure missing files do exist, checkout missing files if any
-if [[ ! -f data/conf/postfix/mailcow_anonymize_headers.pcre ]]; then
-  git checkout origin/${BRANCH} data/conf/postfix/mailcow_anonymize_headers.pcre
-fi
 
 echo -e "\e[32mFetching new docker-compose version...\e[0m"
 sleep 2