Move mail server to orion

Signed-off-by: Florian Pritz <bluewind@xinu.at>

playbooks/apollo.yml

@@ -15,7 +15,6 @@
     - { role: unbound, tags: ["mail", "unbound"] }
     - { role: postfix, postfix_server: false, postfix_smtpd_public: true, postfix_patchwork_enabled: true, tags: ["mail", "postfix"] }
     - { role: opendkim, dkim_selector: apollo, tags: ['mail', "opendkim"] }
-      #- { role: dovecot, tags: ['mail', "dovecot"] }
     - { role: postfwd, tags: ['mail', "postfwd"] }
     - { role: postgres, postgres_listen_addresses: "'*'", postgres_max_connections: 1000, postgres_ssl: 'on', postgres_shared_buffers: 4096MB,
               postgres_ssl_hosts: ["{{ hostvars['orion.archlinux.org']['ipv4_address'] }}{{ hostvars['orion.archlinux.org']['ipv4_netmask'] }}",

playbooks/orion.yml

@@ -13,7 +13,11 @@
     - { role: root_ssh, tags: ['root_ssh'] }
     - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/orion", postgres_backup_dir: None, tags: ['borg'] }
     - { role: opendkim, dkim_selector: orion, tags: ['mail'] }
-    - { role: postfix, postfix_server: false, tags: ['mail'] }
+    - { role: dovecot, tags: ['mail', "dovecot"] }
+    - { role: spampd, tags: ["mail", "spampd"] }
+    - { role: unbound, tags: ["mail", "unbound"] }
+    - { role: postfwd, tags: ['mail', "postfwd"] }
+    - { role: postfix, postfix_server: true, tags: ['mail'] }
     - { role: archusers, tags: ['archusers'] }
     - { role: nginx, letsencrypt_validation_dir: "/var/lib/letsencrypt", tags: ["nginx"] }
     - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", postgres_ssl: 'on', tags: ['dbscripts', 'archusers'] }