Builds for Stretch

Vagrantfile

@@ -39,7 +39,7 @@ Vagrant.configure(2) do |config|
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   # config.vm.synced_folder "../data", "/vagrant_data"
-  config.vm.synced_folder ".", "/root"
+  config.vm.synced_folder "ansible", "/root"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -72,10 +72,11 @@ Vagrant.configure(2) do |config|
   # SHELL
 
   config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "playbooks/ispmail.yml"
-    ansible.become = true
-    ansible.become_user = 'root'
-    ansible.compatibility_mode = '2.0'
+    ansible.playbook = "ansible/ispmail.yml"
+    ansible.sudo = true
+    #ansible.become = true
+    #ansible.become_user = 'root'
+    #ansible.compatibility_mode = '2.0'
     #ansible.verbose = 'vvv'
   end
 

ansible.cfg → ansible/ansible.cfg

@@ -5,7 +5,7 @@
 display_skipped_hosts = False
 
 # Look for the inventory of hosts in the current directory
-hostfile = ./hosts
+inventory = ./hosts
 
 # Connect as 'root' by default via SSH
 remote_user = root
@@ -23,4 +23,4 @@ pipelining = True
 log_path = ./log
 
 # Path to roles
-roles_path = ./roles
+roles_path = ansible/roles

ansible/ispmail.retry

@@ -0,0 +1 @@
+default

playbooks/ispmail.yml → ansible/ispmail.yml

@@ -2,7 +2,7 @@
 # Requires Ansible >= 1.9
 - hosts: all
   roles:
-  #- dumpvars
+  - dumpvars
   - ispmail-packages
   - ispmail-certificate
   - ispmail-database

ansible/roles/dumpvars/README.md

@@ -0,0 +1,4 @@
+# Purpose
+
+Create a file /tmp/ansible-vars on the target system containing all
+Ansible variables. Useful for debugging.

roles/ispmail-postfix/tasks/main.yml → ansible/roles/ispmail-postfix/tasks/main.yml

@@ -60,28 +60,22 @@
 - name: Set TLS encryption key
   command: postconf smtpd_tls_key_file=/etc/ssl/private/mailserver.pem
 
-- name: Copying patch for Debian bug 739738
-  copy: src=spamassassin.patch dest=/tmp/spamassassin.patch
+# - name: Enabling Spamassassin milter
+#   command: postconf smtpd_milters=unix:/spamass/spamass.sock
 
-- name: Patching Debian bug 739738
-  patch: src=/tmp/spamassassin.patch strip=0 basedir=/ remote_src=True
+# - name: Configuring Spamassassin milter
+#   command: postconf milter_connect_macros="i j {daemon_name} v {if_name} _"
 
-- name: Enabling Spamassassin milter
-  command: postconf smtpd_milters=unix:/spamass/spamass.sock
+# - name: Setting spamd options
+#   copy: src=etc-default-spamassassin dest=/etc/default/spamassassin
+#   notify: restart spamassassin
 
-- name: Configuring Spamassassin milter
-  command: postconf milter_connect_macros="i j {daemon_name} v {if_name} _"
+# - name: Adding user spamass-milter to debian-spamd group
+#   user: name=spamass-milter groups=debian-spamd
+#   notify: restart spamassassin
 
-- name: Setting spamd options
-  copy: src=etc-default-spamassassin dest=/etc/default/spamassassin
-  notify: restart spamassassin
-
-- name: Adding user spamass-milter to debian-spamd group
-  user: name=spamass-milter groups=debian-spamd
-  notify: restart spamassassin
-
-- name: Enabling spamd at startup
-  command: systemctl enable spamassassin
+# - name: Enabling spamd at startup
+#   command: systemctl enable spamassassin
 
 - name: Allow emails up to 40 MB large
   command: postconf message_size_limit=41943040

roles/ispmail-webmail-apache/tasks/main.yml → ansible/roles/ispmail-webmail-apache/tasks/main.yml

@@ -2,7 +2,7 @@
   apt: name={{item}} state=installed
   with_items:
   - apache2
-  - libapache2-mod-php5
+  - libapache2-mod-php
   notify: restart apache
 - name: Create Apache vhost configuration for HTTPS (RoundCube and PHPmyadmin)
   template: src=webmail.conf-443.j2 dest=/etc/apache2/sites-available/default-ssl.conf