diff --git a/roles/moinmoin/templates/moin/mywiki.py.j2 b/roles/moinmoin/templates/moin/mywiki.py.j2 index 397ac4da..e521b196 100644 --- a/roles/moinmoin/templates/moin/mywiki.py.j2 +++ b/roles/moinmoin/templates/moin/mywiki.py.j2 @@ -17,7 +17,7 @@ the farm's common settings. from farmconfig import FarmConfig {% if not moinmoin.main -%} # we import config to disable the account creation at the bottom of this file -from Moinmoin import config +from MoinMoin import config {% endif -%} # now we subclass that config (inherit from it) and change what's different: @@ -53,7 +53,7 @@ class Config(FarmConfig): # This is checked by some rather critical and potentially harmful actions, # like despam or PackageInstaller action: # 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", u"WikiYnerant"] + superuser= [u"PeBecue", u"Wiki20-100", u"Benjamin", u"WikiPollion", u"WikiErdnaxe", u"WikiShirenn", u"WikiYnerant"] # Custom logo logo_string = u'Crans' @@ -158,6 +158,7 @@ class Config(FarmConfig): '2a0c:700::/32', # IPv6 Crans '45.66.108.0/22', # IPv4 Aurore '2a09:6840::/32', # IPv6 Aurore + '138.231.175.203/32', # IPv4 PC Kfet ], actions=['newaccount'], actions_msg={'newaccount':"La création de comptes n'est autorisée que depuis le réseau du Crans ou sur zamok."}, @@ -176,13 +177,14 @@ class Config(FarmConfig): or ip.startswith('185.230.78.') \ or ip.startswith('185.230.79.') \ or ip.startswith('172.16.') \ - or ip.startwith('138.231.') \ # IPv4 ENS + or ip.startwith('138.231.') \ or ip.startwith('45.66.108.') \ or ip.startwith('45.66.109.') \ or ip.startwith('45.66.110.') \ or ip.startwith('45.66.111.') \ or ip.startswith('2a0c:700:') \ - or ip.startswith('2a09:6840:') + or ip.startswith('2a09:6840:') \ + or ip.startswith("138.231.175.203") {% else %} return False {% endif %}