crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

[moinmoin] Remove some superusers, whitelist PC Kfet 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
certbot_on_virtu
Yohann D'ANELLO 2021-06-22 12:37:06 +02:00
parent 213f618848
commit 8fbe34e82b
Signed by: _ynerant
GPG Key ID: 3A75C55819C8CF85
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/moinmoin/templates/moin/mywiki.py.j2
View File

@ -17,7 +17,7 @@ the farm's common settings.
from farmconfig import FarmConfig from farmconfig import FarmConfig
{% if not moinmoin.main -%} {% if not moinmoin.main -%}
# we import config to disable the account creation at the bottom of this file # we import config to disable the account creation at the bottom of this file
from Moinmoin import config from MoinMoin import config
{% endif -%} {% endif -%}
# now we subclass that config (inherit from it) and change what's different: # 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, # This is checked by some rather critical and potentially harmful actions,
# like despam or PackageInstaller action: # like despam or PackageInstaller action:
# WikiShirenn is a giant avocado https://youtu.be/UJeH8gcjuj0 # 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 # Custom logo
logo_string = u'<img src="/wiki/logo.svg" alt="Crans" height="60">' logo_string = u'<img src="/wiki/logo.svg" alt="Crans" height="60">'
@ -158,6 +158,7 @@ class Config(FarmConfig):
'2a0c:700::/32', # IPv6 Crans '2a0c:700::/32', # IPv6 Crans
'45.66.108.0/22', # IPv4 Aurore '45.66.108.0/22', # IPv4 Aurore
'2a09:6840::/32', # IPv6 Aurore '2a09:6840::/32', # IPv6 Aurore
'138.231.175.203/32', # IPv4 PC Kfet
], ],
actions=['newaccount'], actions=['newaccount'],
actions_msg={'newaccount':"La cr&eacute;ation de comptes n'est autoris&eacute;e que depuis le r&eacute;seau du Crans ou sur zamok."}, actions_msg={'newaccount':"La cr&eacute;ation de comptes n'est autoris&eacute;e que depuis le r&eacute;seau du Crans ou sur zamok."},
@ -176,13 +177,14 @@ class Config(FarmConfig):
or ip.startswith('185.230.78.') \ or ip.startswith('185.230.78.') \
or ip.startswith('185.230.79.') \ or ip.startswith('185.230.79.') \
or ip.startswith('172.16.') \ 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.108.') \
or ip.startwith('45.66.109.') \ or ip.startwith('45.66.109.') \
or ip.startwith('45.66.110.') \ or ip.startwith('45.66.110.') \
or ip.startwith('45.66.111.') \ or ip.startwith('45.66.111.') \
or ip.startswith('2a0c:700:') \ or ip.startswith('2a0c:700:') \
or ip.startswith('2a09:6840:') or ip.startswith('2a09:6840:') \
or ip.startswith("138.231.175.203")
{% else %} {% else %}
return False return False
{% endif %} {% endif %}