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

Sync prod configuration moin

certbot_on_virtu
Alexandre Iooss 2020-11-28 22:33:35 +01:00
parent 6412c7d687
commit 5c8ac3685d
No known key found for this signature in database
GPG Key ID: 6C79278F3FCDCC02
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,11 @@ 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:
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 # Custom logo
logo_string = u'<img src="/wiki/logo.png" alt="Crans" height="60">' logo_string = u'<img src="/wiki/logo.svg" alt="Crans" height="60">'
# French by default # French by default
language_default = 'fr' language_default = 'fr'
@ -145,7 +146,15 @@ class Config(FarmConfig):
assoc_path='/var/local/wiki/assowiki/', assoc_path='/var/local/wiki/assowiki/',
), ),
ip_range.IpRange( 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=['newaccount'],
actions_msg={'newaccount':"La cr&eacute;ation de comptes n'est autoris&eacute;e que depuis le r&eacute;seau du Cr@ns ou sur zamok."}, actions_msg={'newaccount':"La cr&eacute;ation de comptes n'est autoris&eacute;e que depuis le r&eacute;seau du Cr@ns ou sur zamok."},
), ),

9
roles/moinmoin/templates/nginx/sites-available/wiki.j2
View File

@ -3,7 +3,7 @@
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name wiki.crans.org; server_name wiki.adm.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;
@ -25,10 +25,7 @@ server {
include uwsgi_params; include uwsgi_params;
} }
set_real_ip_from 10.231.136.0/24; set_real_ip_from 172.16.10.0/24;
set_real_ip_from 2a0c:700:0::/48; set_real_ip_from fd00:0:0:10::/64;
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
real_ip_header X-Real-Ip; real_ip_header X-Real-Ip;
} }