Merge pull request #141 from cji/master

Fixes issue #8

roles/mailserver/files/etc_postfix_maps_smtp_header_checks.pcre

+/^\s*(Received: from)[^\n]*(.*)/ REPLACE $1 [127.0.0.1] (localhost [127.0.0.1])$2
+/^\s*User-Agent/        IGNORE
+/^\s*X-Enigmail/        IGNORE
+/^\s*X-Mailer/          IGNORE
+/^\s*X-Originating-IP/  IGNORE

roles/mailserver/tasks/postfix.yml

     - postgresql-9.1
     - postfix-pgsql
     - python-psycopg2
+    - postfix-pcre
 
 - name: Set postgres password
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"
   template: src=mailserver.sql.j2 dest=/etc/postfix/import.sql owner=root group=root mode=0600
   notify: import sql postfix
 
+- name: Create postfix maps directory
+  file: path=/etc/postfix/maps state=directory owner=root group=root
+  when: mail_header_privacy == 1
+
+- name: Copy smtp_header_checks.pcre
+  copy: src=etc_postfix_maps_smtp_header_checks.pcre dest=/etc/postfix/maps/smtp_header_checks.pcre owner=root group=root
+  when: mail_header_privacy == 1
+
 - name: Copy main.cf
   template: src=etc_postfix_main.cf.j2 dest=/etc/postfix/main.cf owner=root group=root
   notify: restart postfix

roles/mailserver/templates/etc_postfix_main.cf.j2

 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_action = enforce
 postscreen_greet_action = enforce
+
+{% if mail_header_privacy == 1 %}
+# Remove local client IP from headers
+smtp_header_checks = pcre:/etc/postfix/maps/smtp_header_checks.pcre
+{% endif %}

vars/testing.yml

   - source: "webmaster@{{ domain }}"
     destination: "{{ admin_email }}"
     domain_pk_id: 1
+mail_header_privacy: 1
 
 # z-push
 zpush_timezone: "America/New_York"  #Example: "America/New_York"

vars/user.yml

   - source: "webmaster@{{ domain }}"
     destination: "{{ admin_email }}"
     domain_pk_id: 1
+mail_header_privacy: 1
 
 # z-push
 zpush_timezone: "TODO"  #Example: "America/New_York"