From 3eafb60eba49a947da82b7ac7bf496dfa7d8a992 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Mon, 29 Feb 2016 21:55:12 +0100
Subject: [PATCH] Fix mailman vhost.

---
 roles/mail/tasks/main.yml           |  2 +-
 roles/mail/templates/nginx/vhost.j2 | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 6ac3ea7..914cdc8 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -61,7 +61,7 @@
   tags: mail
 
 - name: Configure mailman vhost
-  template: src=mailman/vhost.j2 dest=/etc/nginx/sites-available/mailman
+  template: src=nginx/vhost.j2 dest=/etc/nginx/sites-available/mailman
   notify: Restart nginx
   tags: mail
 
diff --git a/roles/mail/templates/nginx/vhost.j2 b/roles/mail/templates/nginx/vhost.j2
index 3c547de..aa0b445 100644
--- a/roles/mail/templates/nginx/vhost.j2
+++ b/roles/mail/templates/nginx/vhost.j2
@@ -1,22 +1,14 @@
 server {
 	listen 80;
 	server_name {{ mailman_domain }};
-	root /usr/lib/;
+	root /usr/lib/cgi-bin/mailman/;
 
 	location = / {
-		rewrite ^ /mailman/listinfo permanent;
+		rewrite ^ /listinfo permanent;
 	}
 
 	location / {
-		rewrite ^ /mailman$uri?$args;
-	}
-
-	location = /mailman/ {
-		rewrite ^ /mailman/listinfo permanent;
-	}
-
-	location /mailman {
-		fastcgi_split_path_info (^/mailman/[^/]*)(.*)$;
+		fastcgi_split_path_info (^/[^/]*)(.*)$;
 		include /etc/nginx/fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 		fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -24,9 +16,11 @@ server {
 		fastcgi_intercept_errors on;
 		fastcgi_pass unix:/var/run/fcgiwrap.socket;
 	}
+
 	location /images/mailman {
 		alias /usr/share/images/mailman;
 	}
+
 	location /pipermail {
 		alias /var/lib/mailman/archives/public;
 		autoindex on;