diff options
author | Guilhem Moulin <guilhem@fripost.org> | 2015-12-09 17:21:51 +0100 |
---|---|---|
committer | Guilhem Moulin <guilhem@fripost.org> | 2015-12-09 17:21:51 +0100 |
commit | ea7372eb8a2fa66b08ec37b030a098998e0aa47d (patch) | |
tree | c9013b551966906515dbee5f1417526e7197b58b /roles | |
parent | 2e67b6809d3b44da2e1e6ee6a974f10a3844964f (diff) |
wibble
Diffstat (limited to 'roles')
-rw-r--r-- | roles/lists/files/etc/nginx/sites-available/sympa | 10 | ||||
-rw-r--r-- | roles/webmail/files/etc/nginx/sites-available/roundcube | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/roles/lists/files/etc/nginx/sites-available/sympa b/roles/lists/files/etc/nginx/sites-available/sympa index 2dad552..146f1a2 100644 --- a/roles/lists/files/etc/nginx/sites-available/sympa +++ b/roles/lists/files/etc/nginx/sites-available/sympa @@ -1,66 +1,66 @@ server { listen 80; - listen [::]:80 ipv6only=on; + listen [::]:80; server_name lists.fripost.org; access_log /var/log/nginx/lists.access.log; error_log /var/log/nginx/lists.error.log info; return 302 https://$host$request_uri; } server { listen 443; - listen [::]:443 ipv6only=on; + listen [::]:443; server_name lists.fripost.org; access_log /var/log/nginx/lists.access.log; error_log /var/log/nginx/lists.error.log info; include conf.d/ssl; ssl_certificate /etc/nginx/ssl/lists.fripost.org.pem; ssl_certificate_key /etc/nginx/ssl/lists.fripost.org.key; location = / { return 302 /sympa$args; } location ^~ /static-sympa/ { alias /var/lib/sympa/static_content/; expires 30d; } location ^~ /sympa { fastcgi_split_path_info ^(/sympa)(.*)$; include fastcgi/params; - + fastcgi_pass unix:/run/wwsympa.socket; gzip off; } location ~* ^/([^/]+)/?$ { return 302 /$1/sympa$args; } location ~* ^/([^/]+)/sympa(/.*)?$ { set $vhost $1; if (!-f /etc/sympa/$vhost/robot.conf) { return 404; } fastcgi_split_path_info ^(/[^/]+/sympa)(.*)$; include fastcgi/params; - + fastcgi_pass unix:/run/wwsympa.socket; gzip off; - + fastcgi_param SERVER_NAME $vhost; } location / { return 404; } } diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube index af1818b..76e07fe 100644 --- a/roles/webmail/files/etc/nginx/sites-available/roundcube +++ b/roles/webmail/files/etc/nginx/sites-available/roundcube @@ -1,37 +1,37 @@ server { listen 80; - listen [::]:80 ipv6only=on; + listen [::]:80; server_name mail.fripost.org; access_log /var/log/nginx/roundcube.access.log; error_log /var/log/nginx/roundcube.error.log info; return 301 https://$host$request_uri; } server { listen 443; - listen [::]:443 ipv6only=on; + listen [::]:443; server_name mail.fripost.org; root /var/lib/roundcube; include conf.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=mail.fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html ssl_certificate /etc/nginx/ssl/mail.fripost.org.chained.pem; ssl_certificate_key /etc/nginx/ssl/mail.fripost.org.key; location = /favicon.ico { root /usr/share/roundcube/skins/default/images; log_not_found off; access_log off; expires max; } location = /robots.txt { allow all; |