diff --git a/gestion/mail/mail.py b/gestion/mail/mail.py index 81b0c6f6..f74c77a0 100644 --- a/gestion/mail/mail.py +++ b/gestion/mail/mail.py @@ -168,9 +168,8 @@ 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', 'intranet.crans.org') CA = '/etc/ssl/certs/cacert.org.pem' - ROOT = 'https://%s' % HOST + ROOT = os.getenv('DBG_INTRANET', 'https://intranet.crans.org') url = ROOT + '/validation/register/%s/' % view_name payload = { 'data': json.dumps(data), diff --git a/impression/digicode.py b/impression/digicode.py index 9457dea9..4128cb06 100644 --- a/impression/digicode.py +++ b/impression/digicode.py @@ -38,9 +38,9 @@ digicode_pass = secrets_new.get("digicode_pass") # ############################################################# # CONSTANTES # ############################################################# -INTRANET = os.getenv('DBG_INTRANET', 'intranet.crans.org') -CREATION_LINK = "https://%s/digicode/create/" % INTRANET -LIST_LINK = "https://%s/digicode/list/" % INTRANET +INTRANET = os.getenv('DBG_INTRANET', 'https://intranet.crans.org') +CREATION_LINK = "%s/digicode/create/" % INTRANET +LIST_LINK = "%s/digicode/list/" % INTRANET CERTIFICATE = "/etc/ssl/certs/cacert.org.pem" # ############################################################# diff --git a/impression/digicode_server.py b/impression/digicode_server.py index 65bf69f1..80fe7e75 100755 --- a/impression/digicode_server.py +++ b/impression/digicode_server.py @@ -11,8 +11,8 @@ digicode_pass = gestion.secrets_new.get('digicode_pass') PIDFILE = "/var/run/digicode.pid" HOST, PORT = "zamok.adm.crans.org", 1200 -INTRANET = os.getenv('DBG_INTRANET', 'intranet.crans.org') -DIGICODE_LINK = "https://%s/digicode/delete/" % INTRANET +INTRANET = os.getenv('DBG_INTRANET', 'https://intranet.crans.org') +DIGICODE_LINK = "%s/digicode/delete/" % INTRANET CERTIFICATE = "/etc/ssl/certs/cacert.org.pem" def log(message = "", logfile = "/var/log/crans/digicode.log"): diff --git a/testing.sh b/testing.sh index f0481e10..73bd2f99 100644 --- a/testing.sh +++ b/testing.sh @@ -54,7 +54,7 @@ export DBG_SECRETS=/etc/crans/dbg_secrets/`whoami`/ export DBG_WIFIMAP_DB=$CPATH/var/wifi_xml # Addresse vers l'intranet (version 2) -export DBG_INTRANET=intranet-dev.crans.org +export DBG_INTRANET=https://intranet-dev.crans.org # Base de donnée à utiliser pour l'intranet (pgsql) #export DBG_DJANGO_DB=localhost