From 0714757818a0b188ff75b4291fa96a44a3ad25cb Mon Sep 17 00:00:00 2001
From: Christoph Haas <email@christoph-haas.de>
Date: Mon, 9 Oct 2017 11:57:58 +0200
Subject: [PATCH] Bug fixing

---
 Vagrantfile                              | 21 ++++++++++++---------
 ansible.cfg                              |  2 ++
 hosts                                    |  4 +---
 ispmail.yml                              | 12 ------------
 playbooks/ispmail.yml                    | 12 ++++++++++++
 roles/ispmail-certificate/tasks/main.yml |  2 +-
 6 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 ispmail.yml
 create mode 100644 playbooks/ispmail.yml

diff --git a/Vagrantfile b/Vagrantfile
index 2d7d623..d6e6bb5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
   #config.vm.box = "jessie64"
-  config.vm.box = "debian/jessie64"
+  config.vm.box = "debian/stretch64"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -39,6 +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"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -71,8 +72,10 @@ Vagrant.configure(2) do |config|
   # SHELL
 
   config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "ispmail.yml"
-    ansible.sudo = true
+    ansible.playbook = "playbooks/ispmail.yml"
+    ansible.become = true
+    ansible.become_user = 'root'
+    ansible.compatibility_mode = '2.0'
     #ansible.verbose = 'vvv'
   end
 
@@ -82,16 +85,16 @@ Vagrant.configure(2) do |config|
   end
 
   # HTTP
-  config.vm.network "forwarded_port", guest: 80, host: 1080
+  config.vm.network "forwarded_port", guest: 80, host: 10080
   # HTTPS
-  config.vm.network "forwarded_port", guest: 443, host: 1443
+  config.vm.network "forwarded_port", guest: 443, host: 10443
   # LDAP
-  config.vm.network "forwarded_port", guest: 143, host: 1143
+  config.vm.network "forwarded_port", guest: 143, host: 10143
   # POP3
-  config.vm.network "forwarded_port", guest: 110, host: 1110
+  config.vm.network "forwarded_port", guest: 110, host: 10110
   # SMTP
-  config.vm.network "forwarded_port", guest: 25, host: 1025
+  config.vm.network "forwarded_port", guest: 25, host: 10025
   # Submission
-  config.vm.network "forwarded_port", guest: 587, host: 1587
+  config.vm.network "forwarded_port", guest: 587, host: 10587
 end
 
diff --git a/ansible.cfg b/ansible.cfg
index 5931821..ffd7210 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -22,3 +22,5 @@ pipelining = True
 # Log actions
 log_path = ./log
 
+# Path to roles
+roles_path = ./roles
diff --git a/hosts b/hosts
index 6ddcb12..05614f6 100644
--- a/hosts
+++ b/hosts
@@ -1,3 +1 @@
-default
-localhost ansible_connection=local
-
+localhost ansible_connection=local
\ No newline at end of file
diff --git a/ispmail.yml b/ispmail.yml
deleted file mode 100644
index 722d9f6..0000000
--- a/ispmail.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Requires Ansible >= 1.9
-- hosts: all
-  roles:
-  #- dumpvars
-  - ispmail-packages
-  - ispmail-certificate
-  - ispmail-database
-  - ispmail-postfix
-  - ispmail-dovecot
-  - ispmail-webmail
-  - ispmail-webmail-apache
diff --git a/playbooks/ispmail.yml b/playbooks/ispmail.yml
new file mode 100644
index 0000000..722d9f6
--- /dev/null
+++ b/playbooks/ispmail.yml
@@ -0,0 +1,12 @@
+---
+# Requires Ansible >= 1.9
+- hosts: all
+  roles:
+  #- dumpvars
+  - ispmail-packages
+  - ispmail-certificate
+  - ispmail-database
+  - ispmail-postfix
+  - ispmail-dovecot
+  - ispmail-webmail
+  - ispmail-webmail-apache
diff --git a/roles/ispmail-certificate/tasks/main.yml b/roles/ispmail-certificate/tasks/main.yml
index 35c8368..0ee1fb6 100644
--- a/roles/ispmail-certificate/tasks/main.yml
+++ b/roles/ispmail-certificate/tasks/main.yml
@@ -3,7 +3,7 @@
   command: >
     openssl req -newkey rsa:4096
       -nodes -sha512 -x509
-      -days {{ ispmail_certificate_days_valid }}
+      -days "{{ ispmail_certificate_days_valid }}"
       -nodes
       -subj "/C={{ ispmail_certificate_country }}/ST={{ ispmail_certificate_state }}/L={{ ispmail_certificate_location }}/O={{ ispmail_certificate_organisation }}/OU={{ ispmail_certificate_orgunit }}{% for domain in ispmail_certificate_domains %}/CN={{ domain }}{% endfor %}/emailAddress={{ ispmail_certificate_email }}"
       -out /etc/ssl/certs/mailserver.pem