From e8514e6a5ed5677c52cceb6c526c33d9bb235355 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 4 Jun 2015 18:57:34 +0200
Subject: =?UTF-8?q?Rename=20imap.conf=20=E2=86=92=20roundcube.conf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/IMAP-proxy/files/etc/stunnel/imap.conf      | 59 -----------------------
 roles/IMAP-proxy/files/etc/stunnel/roundcube.conf | 59 +++++++++++++++++++++++
 roles/IMAP-proxy/tasks/main.yml                   |  4 +-
 3 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 roles/IMAP-proxy/files/etc/stunnel/imap.conf
 create mode 100644 roles/IMAP-proxy/files/etc/stunnel/roundcube.conf

(limited to 'roles/IMAP-proxy')

diff --git a/roles/IMAP-proxy/files/etc/stunnel/imap.conf b/roles/IMAP-proxy/files/etc/stunnel/imap.conf
deleted file mode 100644
index af29023..0000000
--- a/roles/IMAP-proxy/files/etc/stunnel/imap.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-; **************************************************************************
-; * Global options                                                         *
-; **************************************************************************
-
-; setuid()/setgid() to the specified user/group in daemon mode
-setuid = stunnel4
-setgid = stunnel4
-
-; PID is created inside the chroot jail
-pid = /var/run/stunnel4/imap.pid
-
-; Only log messages at severity warning (4) and higher
-debug = 4
-
-; **************************************************************************
-; * Service defaults may also be specified in individual service sections  *
-; **************************************************************************
-
-; Certificate/key is needed in server mode and optional in client mode
-;cert = /etc/stunnel/mail.pem
-;key = /etc/stunnel/mail.pem
-client = yes
-socket = a:SO_BINDTODEVICE=lo
-
-; Some performance tunings
-socket = l:TCP_NODELAY=1
-socket = r:TCP_NODELAY=1
-
-; Prevent MITM attacks
-verify = 4
-
-; Disable support for insecure protocols
-options = NO_SSLv2
-options = NO_SSLv3
-options = NO_TLSv1
-options = NO_TLSv1.1
-
-; These options provide additional security at some performance degradation
-options = SINGLE_ECDH_USE
-options = SINGLE_DH_USE
-
-; Select permitted SSL ciphers
-ciphers = EECDH+AES:EDH+AES:!MEDIUM:!LOW:!EXP:!aNULL:!eNULL:!SSLv2:!SSLv3:!TLSv1:!TLSv1.1
-
-; **************************************************************************
-; * Service definitions (remove all services for inetd mode)               *
-; **************************************************************************
-
-[imaps]
-accept  = localhost:143
-connect = imap.fripost.org:993
-CAfile  = /etc/stunnel/certs/imap.fripost.org.pem
-
-[ldaps]
-accept  = localhost:389
-connect = ldap.fripost.org:636
-CAfile  = /etc/stunnel/certs/ldap.fripost.org.pem
-
-; vim:ft=dosini
diff --git a/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf b/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf
new file mode 100644
index 0000000..c14bac3
--- /dev/null
+++ b/roles/IMAP-proxy/files/etc/stunnel/roundcube.conf
@@ -0,0 +1,59 @@
+; **************************************************************************
+; * Global options                                                         *
+; **************************************************************************
+
+; setuid()/setgid() to the specified user/group in daemon mode
+setuid = stunnel4
+setgid = stunnel4
+
+; PID is created inside the chroot jail
+pid = /var/run/stunnel4/roundcube.pid
+
+; Only log messages at severity warning (4) and higher
+debug = 4
+
+; **************************************************************************
+; * Service defaults may also be specified in individual service sections  *
+; **************************************************************************
+
+; Certificate/key is needed in server mode and optional in client mode
+;cert = /etc/stunnel/mail.pem
+;key = /etc/stunnel/mail.pem
+client = yes
+socket = a:SO_BINDTODEVICE=lo
+
+; Some performance tunings
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+
+; Prevent MITM attacks
+verify = 4
+
+; Disable support for insecure protocols
+options = NO_SSLv2
+options = NO_SSLv3
+options = NO_TLSv1
+options = NO_TLSv1.1
+
+; These options provide additional security at some performance degradation
+options = SINGLE_ECDH_USE
+options = SINGLE_DH_USE
+
+; Select permitted SSL ciphers
+ciphers = EECDH+AES:EDH+AES:!MEDIUM:!LOW:!EXP:!aNULL:!eNULL:!SSLv2:!SSLv3:!TLSv1:!TLSv1.1
+
+; **************************************************************************
+; * Service definitions (remove all services for inetd mode)               *
+; **************************************************************************
+
+[imaps]
+accept  = localhost:143
+connect = imap.fripost.org:993
+CAfile  = /etc/stunnel/certs/imap.fripost.org.pem
+
+[ldaps]
+accept  = localhost:389
+connect = ldap.fripost.org:636
+CAfile  = /etc/stunnel/certs/ldap.fripost.org.pem
+
+; vim:ft=dosini
diff --git a/roles/IMAP-proxy/tasks/main.yml b/roles/IMAP-proxy/tasks/main.yml
index 18ad4d6..587fc62 100644
--- a/roles/IMAP-proxy/tasks/main.yml
+++ b/roles/IMAP-proxy/tasks/main.yml
@@ -82,8 +82,8 @@
     - Restart stunnel
 
 - name: Configure stunnel
-  copy: src=etc/stunnel/imap.conf
-        dest=/etc/stunnel/imap.conf
+  copy: src=etc/stunnel/roundcube.conf
+        dest=/etc/stunnel/roundcube.conf
         owner=root group=root
         mode=0644
   register: r3
-- 
cgit v1.2.3