misc: update settings for py3 and move then into settings.d
This commit is contained in:
parent
6d141d869b
commit
7908778314
|
@ -8,11 +8,13 @@ REGISTRATION_OPEN = False
|
||||||
A2_REGISTRATION_CAN_CHANGE_PASSWORD = False
|
A2_REGISTRATION_CAN_CHANGE_PASSWORD = False
|
||||||
A2_REGISTRATION_CAN_DELETE_ACCOUNT = False
|
A2_REGISTRATION_CAN_DELETE_ACCOUNT = False
|
||||||
|
|
||||||
SAML_SIGNATURE_PUBLIC_KEY = file('/etc/authentic2/cert.pem').read()
|
with open('/etc/authentic2/cert.pem') as fd:
|
||||||
SAML_SIGNATURE_PRIVATE_KEY = file('/etc/authentic2/key.pem').read()
|
SAML_SIGNATURE_PUBLIC_KEY = fd.read()
|
||||||
|
|
||||||
SUPANN_LDAP_EXTRA_ATTRIBUTES = filter(None,
|
with open('/etc/authentic2/key.pem') as fd:
|
||||||
os.environ.get('SUPANN_LDAP_EXTRA_ATTRIBUTES', '').split())
|
SAML_SIGNATURE_PRIVATE_KEY = fd.read()
|
||||||
|
|
||||||
|
SUPANN_LDAP_EXTRA_ATTRIBUTES = list(filter(None, os.environ.get('SUPANN_LDAP_EXTRA_ATTRIBUTES', '').split()))
|
||||||
|
|
||||||
LDAP_AUTH_SETTINGS = [
|
LDAP_AUTH_SETTINGS = [
|
||||||
{
|
{
|
||||||
|
@ -125,9 +127,9 @@ LDAP_AUTH_SETTINGS = [
|
||||||
] + SUPANN_LDAP_EXTRA_ATTRIBUTES,
|
] + SUPANN_LDAP_EXTRA_ATTRIBUTES,
|
||||||
'attribute_mappings': (('mail', 'email'),),
|
'attribute_mappings': (('mail', 'email'),),
|
||||||
'mandatory_attributes_values': {
|
'mandatory_attributes_values': {
|
||||||
# edugain support
|
# edugain support
|
||||||
'schacHomeOrganization': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION']],
|
'schacHomeOrganization': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION']],
|
||||||
'schacHomeOrganizationtype': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE']],
|
'schacHomeOrganizationtype': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE']],
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -1,2 +1 @@
|
||||||
/etc/authentic2/supann.conf
|
/etc/authentic2/supann.conf
|
||||||
/etc/authentic2/config.py
|
|
||||||
|
|
|
@ -2,5 +2,5 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
|
||||||
MAILTO=root
|
MAILTO=root
|
||||||
|
|
||||||
*/30 * * * * authentic /usr/lib/authentic2-supann/load-multiple-federations.sh
|
*/30 * * * * authentic2 /usr/lib/authentic2-supann/load-multiple-federations.sh
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
config.py /etc/authentic2
|
10supann-settings.py /etc/authentic2/settings.d
|
||||||
update-renater-meta.sh /usr/lib/authentic2-supann
|
update-renater-meta.sh /usr/lib/authentic2-supann
|
||||||
load-multiple-federations.sh /usr/lib/authentic2-supann
|
load-multiple-federations.sh /usr/lib/authentic2-supann
|
||||||
supann.conf /etc/authentic2
|
supann.conf /etc/authentic2
|
||||||
|
|
|
@ -64,10 +64,10 @@ chmod +r $FIXTURE_TMP
|
||||||
chmod +r $METADATA_TMP
|
chmod +r $METADATA_TMP
|
||||||
|
|
||||||
# Load fixture
|
# Load fixture
|
||||||
/usr/bin/authentic2-ctl loaddata -v0 $FIXTURE_TMP
|
/usr/bin/authentic2-manage loaddata -v0 $FIXTURE_TMP
|
||||||
|
|
||||||
# Load metadata
|
# Load metadata
|
||||||
/usr/bin/authentic2-ctl sync-metadata --source=$SOURCE --sp -v1 $METADATA_TMP
|
/usr/bin/authentic2-manage sync-metadata --source=$SOURCE --sp -v1 $METADATA_TMP
|
||||||
|
|
||||||
rm -f $METADATA_TMP $FIXTURE_TMP
|
rm -f $METADATA_TMP $FIXTURE_TMP
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue