diff --git a/roles/moinmoin/templates/moin/mywiki.py.j2 b/roles/moinmoin/templates/moin/mywiki.py.j2
index a71d97df..b03b6dc9 100644
--- a/roles/moinmoin/templates/moin/mywiki.py.j2
+++ b/roles/moinmoin/templates/moin/mywiki.py.j2
@@ -48,10 +48,11 @@ class Config(FarmConfig):
# This is checked by some rather critical and potentially harmful actions,
# like despam or PackageInstaller action:
- superuser= [u"PeBecue", u"Wiki20-100", u"WikiB2moo", u"WikiBoudy", u"Benjamin", u"WikiPollion", u"Fardale", u"WikiErdnaxe"]
+ # WikiShirenn is a giant avocado https://youtu.be/UJeH8gcjuj0
+ superuser= [u"PeBecue", u"Wiki20-100", u"WikiB2moo", u"WikiBoudy", u"Benjamin", u"WikiPollion", u"Fardale", u"WikiErdnaxe", u"WikiShirenn"]
# Custom logo
- logo_string = u'
'
+ logo_string = u'
'
# French by default
language_default = 'fr'
@@ -145,7 +146,15 @@ class Config(FarmConfig):
assoc_path='/var/local/wiki/assowiki/',
),
ip_range.IpRange(
- local_nets=['185.230.76.0/22', '10.53.0.0/16', '10.54.0.0/16', '2a0c:700:0::/40'],
+ local_nets=[
+ '185.230.76.0/22', # ENS
+ '185.230.79.0/23', # test pour zamok
+ '10.53.0.0/16',
+ '10.54.0.0/16',
+ '2a0c:700:0::/40',
+ '45.66.108.0/22', # IPv4 Aurore
+ '2a09:6840::/29' # IPv6 Aurore
+ ],
actions=['newaccount'],
actions_msg={'newaccount':"La création de comptes n'est autorisée que depuis le réseau du Cr@ns ou sur zamok."},
),
diff --git a/roles/moinmoin/templates/nginx/sites-available/wiki.j2 b/roles/moinmoin/templates/nginx/sites-available/wiki.j2
index 40e68cbc..4c7482f0 100644
--- a/roles/moinmoin/templates/nginx/sites-available/wiki.j2
+++ b/roles/moinmoin/templates/nginx/sites-available/wiki.j2
@@ -3,7 +3,7 @@
server {
listen 80;
listen [::]:80;
- server_name wiki.crans.org;
+ server_name wiki.adm.crans.org;
access_log /var/log/nginx/wiki.log combined;
error_log /var/log/nginx/wiki.error.log;
@@ -25,10 +25,7 @@ server {
include uwsgi_params;
}
- set_real_ip_from 10.231.136.0/24;
- set_real_ip_from 2a0c:700:0::/48;
- set_real_ip_from 185.230.76.0/22; #filaire publique
- set_real_ip_from 10.53.0.0/16; #nat des machines wifi crans
- set_real_ip_from 10.54.0.0/16; #nat des machines filaires crans
+ set_real_ip_from 172.16.10.0/24;
+ set_real_ip_from fd00:0:0:10::/64;
real_ip_header X-Real-Ip;
}