paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Update] Remove mailcow_anonymize_headers.pcre checks 

[Postfix] Rename mailcow_anonymize_headers.pcre > anonymize_headers.pcre to prevent collisions
master
André 2018-10-23 22:57:38 +02:00
parent 66d8f33aac
commit 93e0206db4
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/conf/postfix/mailcow_anonymize_headers.pcre → data/conf/postfix/anonymize_headers.pcre
View File

2
data/conf/postfix/main.cf
View File

@ -129,5 +129,5 @@ smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_ma
smtp_sasl_security_options = smtp_sasl_security_options =
smtp_sasl_mechanism_filter = plain, login smtp_sasl_mechanism_filter = plain, login
smtp_tls_policy_maps=proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf 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 mail_name = Postcow

7
update.sh
View File

@ -254,9 +254,6 @@ sleep 2
docker-compose down docker-compose down
# Fix header check # 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 # Silently fixing remote url from andryyy to mailcow
git remote set-url origin https://github.com/mailcow/mailcow-dockerized git remote set-url origin https://github.com/mailcow/mailcow-dockerized
echo -e "\e[32mCommitting current status...\e[0m" 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." echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors."
exit 1 exit 1
fi 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" echo -e "\e[32mFetching new docker-compose version...\e[0m"
sleep 2 sleep 2