diff --git a/gestion/config/config.py b/gestion/config/config.py index a56a7397..7c60fbb2 100644 --- a/gestion/config/config.py +++ b/gestion/config/config.py @@ -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']}, diff --git a/gestion/mail/bornes_a.py b/gestion/mail/bornes_a.py index c7967cfc..f8b2d036 100755 --- a/gestion/mail/bornes_a.py +++ b/gestion/mail/bornes_a.py @@ -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, diff --git a/gestion/mail/mail.py b/gestion/mail/mail.py index 4dc3cfcc..b3834cba 100644 --- a/gestion/mail/mail.py +++ b/gestion/mail/mail.py @@ -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 diff --git a/impression/digicode.py b/impression/digicode.py index 26fb36f3..9457dea9 100644 --- a/impression/digicode.py +++ b/impression/digicode.py @@ -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 diff --git a/impression/digicode_server.py b/impression/digicode_server.py index 591f09d9..65bf69f1 100755 --- a/impression/digicode_server.py +++ b/impression/digicode_server.py @@ -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" diff --git a/utils/portail_captif.py b/utils/portail_captif.py index 1726321f..df11f38b 100644 --- a/utils/portail_captif.py +++ b/utils/portail_captif.py @@ -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: diff --git a/wiki/macro/TV.py b/wiki/macro/TV.py index 1056b779..b7c84e36 100644 --- a/wiki/macro/TV.py +++ b/wiki/macro/TV.py @@ -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,