3 files changed, 12 insertions, 18 deletions
diff --git a/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf b/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf
index 284bcc0..fe0bd5d 100644
--- a/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf
+++ b/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf
@@ -7,7 +7,8 @@ setuid = stunnel4
 setgid = stunnel4
 
 ; PID is created inside the chroot jail
-pid = /var/run/stunnel4/roundcube.pid
+pid =
+foreground = yes
 
 ; Only log messages at severity warning (4) and higher
 debug = 4
diff --git a/roles/IMAP-proxy/handlers/main.yml b/roles/IMAP-proxy/handlers/main.yml
index 5249a7e..39cf5f2 100644
--- a/roles/IMAP-proxy/handlers/main.yml
+++ b/roles/IMAP-proxy/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Restart stunnel
-  service: name=stunnel4 pattern=/usr/bin/stunnel4 state=restarted
+- name: Restart stunnel@roundcube
+  service: name=stunnel4@roundcube state=restarted
 
 - name: Restart Dovecot
   service: name=dovecot state=restarted
diff --git a/roles/IMAP-proxy/tasks/main.yml b/roles/IMAP-proxy/tasks/main.yml
index 587fc62..3d4efb1 100644
--- a/roles/IMAP-proxy/tasks/main.yml
+++ b/roles/IMAP-proxy/tasks/main.yml
@@ -43,16 +43,6 @@
 - meta: flush_handlers
 
 
-- name: Install stunnel
-  apt: pkg=stunnel4
-
-- name: Auto-enable stunnel
-  lineinfile: dest=/etc/default/stunnel4
-              regexp='^(\s*#)?\s*ENABLED='
-              line='ENABLED=1'
-              owner=root group=root
-              mode=0644
-
 - name: Create /etc/stunnel/certs
   file: path=/etc/stunnel/certs
         state=directory
@@ -70,7 +60,7 @@
             mode=0644
   register: r1
   notify:
-    - Restart stunnel
+    - Restart stunnel@roundcube
 
 - name: Copy slapd's X.509 certificate
   copy: src=certs/ldap/ldap.fripost.org.pem
@@ -79,7 +69,7 @@
         mode=0644
   register: r2
   notify:
-    - Restart stunnel
+    - Restart stunnel@roundcube
 
 - name: Configure stunnel
   copy: src=etc/stunnel/roundcube.conf
@@ -88,10 +78,13 @@
         mode=0644
   register: r3
   notify:
-    - Restart stunnel
+    - Restart stunnel@roundcube
+
+- name: Enable stunnel@roundcube
+  service: name=stunnel4@roundcube enabled=yes
 
-- name: Start stunnel
-  service: name=stunnel4 pattern=/usr/bin/stunnel4 state=started
+- name: Start stunnel@roundcube
+  service: name=stunnel4@roundcube state=started
   when: not (r1.changed or r2.changed or r3.changed)
 
 - meta: flush_handlers