infra/ansible
4
5
Fork 5
Code Issues 6 Pull Requests 3 Activity

Adjust mail role to reality (now with working fcgi).

Browse Source
This commit is contained in:
Markus 2016-04-08 20:00:21 +02:00
parent aaf7ff604e
commit 8f70860f8e
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/mail/tasks/main.yml
View File

@ -51,7 +51,7 @@
notify: Restart dovecot notify: Restart dovecot
- name: Ensure correct dovecot certificate permissions - name: Ensure correct dovecot certificate permissions
file: path=/etc/dovecot/ssl/{{ mail_server }}.key owner=root mode=0400 file: path=/etc/dovecot/ssl/{{ mail_server }}.key owner=dovecot mode=0400
notify: Restart dovecot notify: Restart dovecot
- name: Configure mailman - name: Configure mailman
@ -113,7 +113,7 @@
notify: Restart postfix notify: Restart postfix
- name: Ensure correct postfix certificate permissions - name: Ensure correct postfix certificate permissions
file: path=/etc/postfix/ssl/{{ mail_server }}.key owner=root mode=0400 file: path=/etc/postfix/ssl/{{ mail_server }}.key owner=postfix mode=0400
notify: Restart postfix notify: Restart postfix
- name: Create razor directory structure - name: Create razor directory structure

2
roles/mail/templates/mailman/mm_cfg.py.j2
View File

@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
#------------------------------------------------------------- #-------------------------------------------------------------
# The default language for this server. # The default language for this server.
DEFAULT_SERVER_LANGUAGE = 'en' DEFAULT_SERVER_LANGUAGE = 'de'
#------------------------------------------------------------- #-------------------------------------------------------------
# Iirc this was used in pre 2.1, leave it for now # Iirc this was used in pre 2.1, leave it for now

25
roles/mail/templates/nginx/vhost.j2
View File

@ -7,19 +7,32 @@ server {
server_name {{ mailman_domain }}; server_name {{ mailman_domain }};
root /usr/lib/cgi-bin/mailman/;
location /.well-known/acme-challenge {
default_type "text/plain";
alias /var/www/acme-challenge;
}
location = / { location = / {
rewrite ^ /listinfo permanent; rewrite ^ /mailman/listinfo permanent;
} }
location / { location / {
root /usr/lib/cgi-bin/mailman/; rewrite ^ /mailman$uri?$args;
fastcgi_split_path_info (^/[^/]*)(.*)$; }
location = /mailman/ {
rewrite ^ /mailman/listinfo permanent;
}
location /mailman {
root /usr/lib/cgi-bin;
fastcgi_split_path_info (^/mailman/[^/]+)(/.*)$;
fastcgi_pass unix:///var/run/fcgiwrap.socket;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
fastcgi_intercept_errors on;
fastcgi_pass unix:/var/run/fcgiwrap.socket;
} }
location /images/mailman { location /images/mailman {

2
roles/mail/templates/postfix/recipient_access.j2
View File

@ -1 +1 @@
mrks@binary-kitchen.com rblgrey mrks@binary-kitchen.com greylisting