public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

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

93e0206d

André <[email protected]> 8 years ago

.../{mailcow_anonymize_headers.pcre => anonymize_headers.pcre}     | 0
 data/conf/postfix/main.cf                                          | 2 +-
 update.sh                                                          | 7 -------
 3 files changed, 1 insertion(+), 8 deletions(-)
 rename data/conf/postfix/{mailcow_anonymize_headers.pcre => anonymize_headers.pcre} (100%)

Diff

diff --git a/data/conf/postfix/mailcow_anonymize_headers.pcre b/data/conf/postfix/anonymize_headers.pcre
similarity index 100%
rename from data/conf/postfix/mailcow_anonymize_headers.pcre
rename to data/conf/postfix/anonymize_headers.pcre
diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf
index fbcb3d5e..c74108e0 100644
--- a/data/conf/postfix/main.cf
+++ b/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
diff --git a/update.sh b/update.sh
index 4d4654e8..3485cf87 100755
--- a/update.sh
+++ b/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