From fe0c8b88fd09a6d00ad7865ea1e145a38a1cd524 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 5 Feb 2015 15:03:48 +0100
Subject: [PATCH] Revert "Make supann.conf parsable by Python and Shell at the
 same time"

This reverts commit 3290295aa40c1b0516ab757f810df988bff319cc.
---
 config.py              | 18 ++++++++----------
 supann.conf            | 17 ++++++++---------
 update-renater-meta.sh |  6 +++++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/config.py b/config.py
index bd2f133..8e5e21d 100644
--- a/config.py
+++ b/config.py
@@ -1,7 +1,5 @@
 import os
 
-execfile('/etc/authentic2/supann.conf')
-
 A2_PROFILE_CAN_CHANGE_EMAIL = False
 A2_PROFILE_CAN_EDIT_PROFILE = False
 A2_CAN_RESET_PASSWORD = False
@@ -14,13 +12,13 @@ SAML_SIGNATURE_PRIVATE_KEY = file('/etc/authentic2/key.pem').read()
 
 LDAP_AUTH_SETTINGS = [
     {
-        'url': SUPANN_LDAP_URL,
+        'url': os.environ['SUPANN_LDAP_URL'],
         'user_filter': '(&(|(mail=%s)(supannAutreMail=%s)(supannAliasLogin=%s)(uid=%s))(objectClass=supannPerson))',
-        'basedn': SUPANN_LDAP_BASE_DN,
-        'binddn': globals().get('SUPANN_LDAP_BINDDN'),
-        'bindpw': globals().get('SUPANN_LDAP_BINDPW'),
-        'groupsu': 'cn=admin,ou=groups,%s' % SUPANN_LDAP_BASE_DN,
-        'groupstaff': 'cn=admin,ou=groups,%s' % SUPANN_LDAP_BASE_DN,
+        'basedn': os.environ['SUPANN_LDAP_BASE_DN'],
+        'binddn': os.environ.get('SUPANN_LDAP_BINDDN'),
+        'bindpw': os.environ.get('SUPANN_LDAP_BINDPW'),
+        'groupsu': 'cn=admin,ou=groups,%s' % os.environ['SUPANN_LDAP_BASE_DN'],
+        'groupstaff': 'cn=admin,ou=groups,%s' % os.environ['SUPANN_LDAP_BASE_DN'],
         'transient': False,
         'username_template': '{uid[0]}',
         'external_id_tuples': (('uid',), ('dn:noquote',), ),
@@ -124,8 +122,8 @@ LDAP_AUTH_SETTINGS = [
         'attribute_mappings': (('mail', 'email'),),
         'mandatory_attributes_values': {
                 # edugain support
-                'schacHomeOrganization': [EDUGAIN_SCHAC_HOME_ORGANIZATION.decode('utf-8')],
-                'schacHomeOrganizationtype': [EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE.decode('utf-8')],
+                'schacHomeOrganization': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION']],
+                'schacHomeOrganizationtype': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE']],
         },
     }
 ]
diff --git a/supann.conf b/supann.conf
index 9fb4e2f..70f0de5 100644
--- a/supann.conf
+++ b/supann.conf
@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
 # Fichier /etc/default/authentic2
 #
 # Configuration du LDAP
 #
 # URL de l'annuaire LDAP
 #
-SUPANN_LDAP_URL="ldap://127.0.0.1/"
+export SUPANN_LDAP_URL=ldap://127.0.0.1/
 # 
 # Base DN de l'annuaire LDAP
 #
-SUPANN_LDAP_BASE_DN="dc=univ-test,dc=fr"
+export SUPANN_LDAP_BASE_DN=dc=univ-test,dc=fr
 #
 # Bind DN pour connexion à l'annuaire LDAP (optionnel)
 #
@@ -24,15 +23,15 @@ SUPANN_LDAP_BASE_DN="dc=univ-test,dc=fr"
 #
 # URL des métadonnées
 #
-RENATER_METADATA="https://federation.renater.fr/renater/renater-metadata.xml"
+export RENATER_METADATA=https://federation.renater.fr/renater/renater-metadata.xml
 #
 # URL des règles de filtrage des attributs
 #
-RENATER_ATTRIBUTE_FILTERS="https://federation.renater.fr/renater/filtres/renater-attribute-filters-all.xml"
+export RENATER_ATTRIBUTE_FILTERS=https://federation.renater.fr/renater/filtres/renater-attribute-filters-all.xml
 # 
 # URL du certificat de signature des métadonnées
 #
-RENATER_CERTIFICATE="https://federation.renater.fr/renater/metadata-federation-renater.crt"
+export RENATER_CERTIFICATE=https://federation.renater.fr/renater/metadata-federation-renater.crt
 
 # Test
 # export RENATER_METADATA=https://federation.renater.fr/test/renater-test-metadata.xml # test
@@ -43,11 +42,11 @@ RENATER_CERTIFICATE="https://federation.renater.fr/renater/metadata-federation-r
 #
 # Nom de l'organisation
 #
-EDUGAIN_SCHAC_HOME_ORGANIZATION="Université Test Authentic2"
+export EDUGAIN_SCHAC_HOME_ORGANIZATION="Université Test Authentic2"
 #
 # Type de l'organisation
 #
-EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:university"
+export EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:university"
 #
 # Une valeur parmi:
 #  urn:schac:homeOrganizationType:int:university
@@ -61,4 +60,4 @@ EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:univers
 #  urn:schac:homeOrganizationType:int:nren
 
 # Local port for listening
-BIND="127.0.0.1:8080"
+export BIND=127.0.0.1:8080
diff --git a/update-renater-meta.sh b/update-renater-meta.sh
index 55c2798..3ac6ca0 100755
--- a/update-renater-meta.sh
+++ b/update-renater-meta.sh
@@ -15,7 +15,11 @@ function cleanup {
 
 trap "cleanup" EXIT
 
-. /etc/authentic2/supann.conf
+if [ -f  ]; then
+	. /etc/default/authentic2
+else
+	. $BASEDIR/`basename $DEFAULT`
+fi
 
 if ! wget --quiet $RENATER_METADATA -O$METADATA_TMP; then
 	echo ERROR: unable to retrieve metadata from $RENATER_METADATA