From f6c389cfc46375d207b24d132959e147d3f6f51a Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@redhat.com>
Date: Thu, 6 Dec 2018 15:55:41 -0500
Subject: Switch to LE for the ml list

---
 roles/mailman/meta/main.yml        |  2 +-
 roles/mailman/tasks/main.yml       |  4 +++-
 roles/mailman/templates/vhost.conf | 17 +++++------------
 3 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'roles')

diff --git a/roles/mailman/meta/main.yml b/roles/mailman/meta/main.yml
index e949ef9..0d441a6 100644
--- a/roles/mailman/meta/main.yml
+++ b/roles/mailman/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
 - { role: postfix }
-- { role: httpd, custom_vhost: yes }
+- { role: httpd }
 
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index e5b78da..5cf2fe6 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -23,7 +23,9 @@
   notify: update mailman aliases
 
 
-- template: src=vhost.conf dest=/etc/httpd/conf.d/{{ website_url | default( ansible_hostname ) }}.conf
+- template:
+    src: vhost.conf
+    dest: "/etc/httpd/conf.d/{{ website_domain }}.conf.d/mailman.conf"
   notify: restart httpd
 
 - copy: mode=0755 src=update_templates_mailman.sh  dest=/usr/local/bin/update_templates_mailman.sh
diff --git a/roles/mailman/templates/vhost.conf b/roles/mailman/templates/vhost.conf
index bd2f01e..8e4de27 100644
--- a/roles/mailman/templates/vhost.conf
+++ b/roles/mailman/templates/vhost.conf
@@ -1,14 +1,7 @@
-{% for i in '80', '443' %}
-<VirtualHost *:{{ i }}>
+<Directory /usr/lib/mailman/cgi-bin/>
+    DirectoryIndex listinfo
+</Directory>
 
-    <Directory /usr/lib/mailman/cgi-bin/>
-        DirectoryIndex listinfo
-    </Directory>
+RedirectMatch ^/$ /mailman/
 
-    RedirectMatch ^/$ /mailman/
-
-    RedirectMatch ^/mailman[/]*$ /mailman/listinfo
-    ServerName {{ website_url | default( ansible_hostname ) }}
-
-</VirtualHost>
-{% endfor %}
+RedirectMatch ^/mailman[/]*$ /mailman/listinfo
-- 
cgit