DBG_INTRANET est une adresse (donc https:// devant)

This commit is contained in:
Daniel STAN 2015-10-16 17:37:19 +02:00
parent 7d8f7c79ca
commit 196bc1db68
4 changed files with 7 additions and 8 deletions

View file

@ -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),

View file

@ -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"
# #############################################################

View file

@ -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"):

View file

@ -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