Commit aa7bbbd0 authored by Benjamin Graillot's avatar Benjamin Graillot
Browse files

Merge branch 'moinmoin' into 'newinfra'

[moinmoin] Listen on all interfaces

See merge request !98
parents 84cec63a fa51fa7c
{{ ansible_header | comment }} {{ ansible_header | comment }}
server { server {
listen wiki.adm.crans.org:80; listen 80;
listen [::]:80; listen [::]:80;
server_name wiki.crans.org wiki.adm.crans.org; server_name wiki.crans.org;
access_log /var/log/nginx/wiki.log combined; access_log /var/log/nginx/wiki.log combined;
error_log /var/log/nginx/wiki.error.log; error_log /var/log/nginx/wiki.error.log;
...@@ -21,8 +21,8 @@ server { ...@@ -21,8 +21,8 @@ server {
location /www-sitemap.xml { alias /var/local/wiki/www-sitemap.xml; } location /www-sitemap.xml { alias /var/local/wiki/www-sitemap.xml; }
location / { location / {
uwsgi_pass unix:///var/run/uwsgi/app/moinmoin/socket; uwsgi_pass unix:///var/run/uwsgi/app/moinmoin/socket;
include uwsgi_params; include uwsgi_params;
} }
set_real_ip_from 10.231.136.0/24; set_real_ip_from 10.231.136.0/24;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment