Generate certs for Dovecot and Nginx if they are not there.

2 files changed, 20 insertions, 2 deletions

diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube
index 161b940..0c54bf2 100644
--- a/roles/webmail/files/etc/nginx/sites-available/roundcube
+++ b/roles/webmail/files/etc/nginx/sites-available/roundcube
@@ -3,42 +3,42 @@ server {
     listen      80;
     listen [::]:80 ipv6only=on;
 
     server_name  mail.fripost.org;
 
     access_log  /var/log/nginx/roundcube.access.log;
     error_log   /var/log/nginx/roundcube.error.log info;
 
     return 301 https://$host$request_uri;
 }
 
 
 server {
     listen      443;
     listen [::]:443 ipv6only=on;
 
     server_name  mail.fripost.org;
     root         /var/lib/roundcube;
 
     include ssl/config;
-    ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
-    ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+    ssl_certificate     /etc/nginx/ssl/mail.fripost.org.pem;
+    ssl_certificate_key /etc/nginx/ssl/mail.fripost.org.key;
 
     location = /favicon.ico {
         root          /usr/share/roundcube/skins/default/images;
         log_not_found off;
         access_log    off;
         expires       max;
     }
 
     location = /robots.txt {
         allow         all;
         log_not_found off;
         access_log    off;
     }
 
     # Deny all attempts to access hidden files, or files under hidden
     # directories.
     location ~ /\. { return 404; }
 
     access_log  /var/log/nginx/roundcube.access.log;
     error_log   /var/log/nginx/roundcube.error.log info;
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index c737fd1..d79304e 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -61,37 +61,55 @@
               backrefs=yes
               owner=root group=root
               mode=0644
   with_items:
     - classic
     - larry
 
 - name: Configure Roundcube plugins
   template: src=usr/share/roundcube/plugins/{{ item }}/config.inc.php.j2
             dest=/usr/share/roundcube/plugins/{{ item }}/config.inc.php
             owner=root group=root
             mode=0644
   with_items:
     - additional_message_headers
     - managesieve
     - password
 
 - name: Start php5-fpm
   service: name=php5-fpm state=started
 
+- name: Generate a private key and a X.509 certificate for Nginx
+  command: genkeypair.sh x509
+                         --pubkey=/etc/nginx/ssl/mail.fripost.org.pem
+                         --privkey=/etc/nginx/ssl/mail.fripost.org.key
+                         --dns mail.fripost.org
+                         -t rsa -b 4096 -h sha512
+  register: r1
+  changed_when: r1.rc == 0
+  failed_when: r1.rc > 1
+  notify:
+    - Restart Nginx
+
 - name: Copy /etc/nginx/sites-available/roundcube
   copy: src=etc/nginx/sites-available/roundcube
         dest=/etc/nginx/sites-available/roundcube
         owner=root group=root
         mode=0644
+  register: r2
   notify:
     - Restart Nginx
 
 - name: Create /etc/nginx/sites-enabled/roundcube
   file: src=../sites-available/roundcube
         dest=/etc/nginx/sites-enabled/roundcube
         owner=root group=root
         state=link force=yes
+  register: r3
   notify:
     - Restart Nginx
 
+- name: Start Nginx
+  service: name=nginx state=started
+  when: not (r1.changed or r2.changed or r3.changed)
+
 - meta: flush_handlers