crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/intranet2.crans.org/intranet.crans.org/

Browse source
This commit is contained in:
Daniel STAN 2015-08-09 13:22:08 +02:00
parent 5f1a1b1397
commit 22511a52a7
7 changed files with 8 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gestion/config/config.py
View file

@ -455,10 +455,10 @@ debit_max_gratuit = 1000000
## Vlan accueil et isolement ##
###############################
accueil_route = {
'138.231.136.1':{'tcp':['80','443', '22'],'hosts':['intranet.crans.org', 'ssh.crans.org', 'zamok.crans.org']},
'138.231.136.1':{'tcp':['80','443', '22'],'hosts':['ssh.crans.org', 'zamok.crans.org']},
'138.231.136.67':{'tcp':['80','443'],'hosts':['www.crans.org', 'wiki.crans.org', 'wifi.crans.org']},
'138.231.136.98':{'tcp':['20','21','80','111','1024:65535'],'udp':['69','1024:65535'], 'hosts':['ftp.crans.org']},
'138.231.136.130':{'tcp':['80','443'],'hosts':['intranet2.crans.org']},
'138.231.136.130':{'tcp':['80','443'],'hosts':['intranet2.crans.org', 'intranet.crans.org']},
'138.231.136.18':{'tcp':['80','443'],'hosts':['cas.crans.org', 'login.crans.org', 'auth.crans.org']},
'213.154.225.236':{'tcp':['80','443'], 'hosts':['crl.cacert.org']},
'213.154.225.237':{'tcp':['80','443'], 'hosts':['ocsp.cacert.org']},

2
gestion/mail/bornes_a.py
View file

@ -35,7 +35,7 @@ N'hésite pas à nous contacter pour toute question, remarque ou problème à
l'adresse cableurs@crans.org.
Plus d'informations sont disponibles sur :
* https://intranet2.crans.org/wifimap/ pour une carte de la couverture
* https://intranet.crans.org/wifimap/ pour une carte de la couverture
* https://wifi.crans.org/ pour configurer sa machine en WiFi
En te souhaitant une bonne journée,

2
gestion/mail/mail.py
View file

@ -168,7 +168,7 @@ def generate(mail, params, lang=default_language, lang_fallback=default_language
def validation_url(view_name, data='', debug=False):
"""Enregistre une nouvelle url pour le module "validation" de l'intranet."""
import requests
HOST = os.getenv('DBG_INTRANET', 'intranet2.crans.org')
HOST = os.getenv('DBG_INTRANET', 'intranet.crans.org')
CA = '/etc/ssl/certs/cacert.org.pem'
ROOT = 'https://%s' % HOST
url = ROOT + '/validation/register/%s/' % view_name

23
impression/digicode.py
View file

@ -38,7 +38,7 @@ digicode_pass = secrets_new.get("digicode_pass")
# #############################################################
# CONSTANTES
# #############################################################
INTRANET = os.getenv('DBG_INTRANET', 'intranet2.crans.org')
INTRANET = os.getenv('DBG_INTRANET', 'intranet.crans.org')
CREATION_LINK = "https://%s/digicode/create/" % INTRANET
LIST_LINK = "https://%s/digicode/list/" % INTRANET
CERTIFICATE = "/etc/ssl/certs/cacert.org.pem"
@ -108,24 +108,3 @@ def list_code(login=None):
def get_codes(login):
return [code for (code, age, uid) in list_code(login)]
@deprecated
def read_code_file(code):
"""
Lis le fichier correspondant au code.
Renvoie le contenu du fichier.
"""
return "dummy"
# ###############################
# menage
# ###############################
# supprime les codes vieux de plus de 24h
#
@deprecated
def menage():
"""
Supprime les codes vieux de plus de 24h
dummy fun
"""
pass

3
impression/digicode_server.py
View file

@ -9,10 +9,9 @@ import requests
import gestion.secrets_new
digicode_pass = gestion.secrets_new.get('digicode_pass')
CODES = "/var/impression/codes"
PIDFILE = "/var/run/digicode.pid"
HOST, PORT = "zamok.adm.crans.org", 1200
INTRANET = os.getenv('DBG_INTRANET', 'intranet2.crans.org')
INTRANET = os.getenv('DBG_INTRANET', 'intranet.crans.org')
DIGICODE_LINK = "https://%s/digicode/delete/" % INTRANET
CERTIFICATE = "/etc/ssl/certs/cacert.org.pem"

2
utils/portail_captif.py
View file

@ -146,7 +146,7 @@ def get_page(ip, by_mac=False, accueil=False):
def special(action, ip, environ, start_response):
mac = mac_from_ip(ip)
url = "https://intranet2.crans.org/machines/add/"
url = "https://intranet.crans.org/machines/add/"
if 'wifi' in action:
url += 'wifi/'
else:

2
wiki/macro/TV.py
View file

@ -33,7 +33,7 @@ def get_channel_list():
try:
ch_name, ch_ip = a_line.split(":")
#url = unicode("udp://@%s:1234" % tv.dns.idn(unicode(ch_name, 'utf-8'), True), 'utf-8')
url = u"https://intranet2.crans.org/tv/%s.m3u" % unicode(ch_name, 'utf-8')
url = u"https://intranet.crans.org/tv/%s.m3u" % unicode(ch_name, 'utf-8')
d = {
"name": ch_name,
"url": url,