Merge pull request #74 from lukecyca/fix-idem

Improved idempotency and removed ip detection

roles/common/tasks/encfs.yml

@@ -18,6 +18,7 @@
 - name: Check for existing encfs
   shell: ls /encrypted/*
   ignore_errors: True
+  changed_when: False  # never report as "changed"
   register: encfs_check
 
 # If it is empty, we need to create the encfs

roles/mailserver/handlers/main.yml

@@ -8,4 +8,9 @@
   service: name=opendkim state=restarted
 
 - name: restart solr
-  service: name=tomcat6 state=restarted
+  service: name=tomcat6 state=restarted
+
+- name: import mysql postfix
+  mysql_db: name={{ mail_mysql_database }} state=import target=/etc/postfix/import.sql
+  notify: restart postfix
+

roles/mailserver/tasks/checkrbl.yml

@@ -1,9 +1,5 @@
-- name: What is our IP address?
-  command: dig ${mail_server_hostname} +short
-  register: dig_command
-
 - name: Download check-rbl
   get_url: url=https://raw.github.com/lukecyca/check-rbl/f6b222b0ca/check-rbl.pl dest=/opt/check-rbl.pl
 
 - name: Install nightly check-rbl cronjob
-  cron: name="check-rbl" hour="2" minute="0" job="perl /opt/check-rbl.pl -i ${dig_command.stdout}"
+  cron: name="check-rbl" hour="2" minute="0" job="perl /opt/check-rbl.pl -i ${server_ip_address}"

roles/mailserver/tasks/postfix.yml

@@ -11,19 +11,17 @@
 
 - name: Create database user for mail server
   mysql_user: user={{ mail_mysql_username }} password={{ mail_mysql_password }} state=present priv="mailserver.*:ALL"
+  notify: import mysql postfix
 
 - name: Create database for mail server
   mysql_db: name={{ mail_mysql_database }} state=present
+  notify: import mysql postfix
 
-- name: copy over mailserver sql
+- name: Copy import.sql
   template: src=mailserver.sql.j2 dest=/etc/postfix/import.sql owner=root group=root mode=0600
-  tags: import_mysql_postfix
+  notify: import mysql postfix
 
-- name: import mysql postfix
-  mysql_db: name={{ mail_mysql_database }} state=import target=/etc/postfix/import.sql
-  tags: import_mysql_postfix
-
-- name: Copy Postfix config files into place
+- 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_opendkim_TrustedHosts.j2

@@ -1,7 +1,5 @@
 127.0.0.1
-# TODO add your server's IP and DNS hosts, ex:
-# ns1.linode.com
-# 198.58.112.239 
+{{ server_ip_address }}
 {% for domain in mail_virtual_domains %}
 {{ domain.name }}
 {% endfor %}