Merge certbot_mx and postfix playbooks

certbot.yml

@@ -1,34 +0,0 @@
-#!/usr/bin/env ansible-playbook
----
-# Temporary
-# Wildcard certificate for MX servers
-- hosts: titanic.adm.crans.org, redisdead.adm.crans.org
-  vars:
-    certbot:
-      dns_rfc2136_name: certbot_challenge.
-      dns_rfc2136_secret: "{{ vault_certbot_dns_secret }}"
-      mail: root@crans.org
-      certname: crans.org
-      domains: "*.crans.org"
-    bind:
-      masters: "{{ lookup('re2oapi', 'get_role', 'dns-authoritary-master')[0] }}"
-  roles:
-    - certbot
-  tasks:
-    - name: Symlink smtp certificate
-      file:
-        src: /etc/letsencrypt/live/crans.org/fullchain.pem
-        dest: /etc/ssl/certs/smtp.pem
-        state: link
-        force: true
-    - name: Symlink smtp private key
-      file:
-        src: /etc/letsencrypt/live/crans.org/privkey.pem
-        dest: /etc/ssl/private/smtp.pem
-        state: link
-        force: true
-    - name: reload postfix
-      systemd:
-        enabled: yes
-        state: restarted
-        name: postfix

host_vars/titanic.adm.crans.org

@@ -0,0 +1,7 @@
+postfix:
+  primary: false
+  secondary: true
+  public: true
+  dkim: true
+  mailman: false
+  titanic: true

postfix.yml

@@ -1,6 +1,16 @@
 #!/usr/bin/env ansible-playbook
 # Postfix playbook
 ---
-- hosts: sputnik.adm.crans.org, boeing.adm.crans.org, redisdead.adm.crans.org
+- hosts: sputnik.adm.crans.org, boeing.adm.crans.org, redisdead.adm.crans.org, titanic.adm.crans.org
+  vars:
+    certbot:
+      dns_rfc2136_name: certbot_challenge.
+      dns_rfc2136_secret: "{{ vault_certbot_dns_secret }}"
+      mail: root@crans.org
+      certname: crans.org
+      domains: "*.crans.org"
+    bind:
+      masters: "{{ lookup('re2oapi', 'get_role', 'dns-authoritary-master')[0] }}"
   roles:
+    - certbot
     - postfix