Compare commits

...

20 Commits

Author SHA1 Message Date
9a7db5bd01 Merge branch 'master' into dist/eole/2.7.2/master 2020-11-24 10:54:09 +01:00
70a1c26d53 Fix disable if in 2020-11-24 10:53:58 +01:00
c150f446c8 Merge branch 'master' into dist/eole/2.7.2/master 2020-11-24 09:32:41 +01:00
09fcd2eacb Disable service 2020-11-24 09:31:12 +01:00
6bf3f75087 Don't run postservice if service is disabled 2020-11-24 09:30:08 +01:00
0a5f0f7d94 Merge branch 'master' into dist/eole/2.7.2/master 2020-11-20 14:45:38 +01:00
beb6341981 Fix llResetUrl bugé 2020-11-20 14:44:51 +01:00
b81f96f0dd Merge branch 'master' into dist/eole/2.7.2/master 2020-11-20 14:35:46 +01:00
eafbc3bd8a Fix typo 2020-11-20 14:34:56 +01:00
46c699813e Merge branch 'master' into dist/eole/2.7.2/master 2020-11-20 14:30:07 +01:00
7e3f6d3408 Updating readme 2020-11-20 11:16:29 +01:00
84ad8d7fbd Merge branch 'master' into dist/eole/2.7.2/master 2020-11-20 11:07:45 +01:00
edc22cacc2 Fix help and variable type 2020-11-20 11:06:51 +01:00
8f5885406f Merge branch 'master' into dist/eole/2.7.2/master 2020-09-10 15:10:07 +02:00
eb06eaaf5a Merge branch 'develop' into staging 2020-09-10 15:05:11 +02:00
7d05697ad0 Merge branch 'develop' into staging 2020-01-16 09:35:09 +01:00
3326273e21 Merge branch 'develop' into staging 2020-01-06 14:58:33 +01:00
8fbafb4c70 Merge branch 'develop' into staging 2019-09-13 16:08:44 +02:00
a96d56b19c Merge branch 'develop' 2019-09-13 10:00:17 +02:00
c7b38c52d0 Update README 2019-07-11 09:44:49 +02:00
4 changed files with 15 additions and 8 deletions

View File

@ -10,10 +10,10 @@ LemonLDAP::NG EOLE integration
GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
#### LemonLDAP::NG repository
#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
* deb https://lemonldap-ng.org/deb stable main
* deb-src https://lemonldap-ng.org/deb stable main
* deb https://lemonldap-ng.org/deb 1.9 main
* deb-src https://lemonldap-ng.org/deb 1.9 main
* Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2
#### Cadoles Repository

View File

@ -12,7 +12,7 @@
<file filelist='lemonCAS' name='/usr/share/php/configCAS/cas.inc.php' source='cas.inc.php.tmpl' mkdir='True'/>
<file filelist='lemonCAS' name='/usr/share/php/CAS/eoleCASConfig.php' source='eoleCASConfig.php.tmpl' mkdir='True'/>
<file filelist='lemonCAS' name='/etc/pam_cas.conf' source="pam_cas_auth.conf"/>
<service>lemonldap-ng-fastcgi-server</service>
<service servicelist="sllemon">lemonldap-ng-fastcgi-server</service>
<service_access service='nginx'>
<port service_accesslist="saLemon">80</port>
<port service_accesslist="saLemon">443</port>
@ -54,7 +54,7 @@
<value>oui</value>
</variable>
<variable name='ssoCALocation' type='string' description="Chemin de l'autorité de certification (ou rien)" mode="expert"/>
<variable name='ssoDebug' type='string' description="Activer le Debug pour la lib php-CAS" mode="expert">
<variable name='ssoDebug' type='oui/non' description="Activer le Debug pour la lib php-CAS" mode="expert">
<value>non</value>
</variable>
<variable name='llSkin' type='string' description="Skin utilisé par LemonLDAP::NG">
@ -112,6 +112,7 @@
<target type='filelist'>lemon</target>
<target type='filelist'>lemonCAS</target>
<target type='family'>LemonLDAP</target>
<target type='servicelist'>sllemon</target>
<target type='service_accesslist'>saLemon</target>
</condition>
<condition name='disabled_if_in' source='llRegisterAccount'>
@ -135,7 +136,8 @@
<variable name='activerLemon'>Activer l'hébergement d'une place de marché HTTP pour OpenNebula</variable>
<variable name='managerWebName'>Nom DNS de l'application de gestion de LemonLDAP::NG ex:manager.cadoles.com</variable>
<variable name='authWebName'>Nom DNS de service d'authentification de LemonLDAP::NG ex:auth.cadoles.com</variable>
<variable name='ldapUserBaseDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
<variable name='ldapUserBaseDN'>DN de base de l'emplactement des utilisateurs dans l'annuaire (ex: ou=users,o=gouv,c=fr)</variable>
<variable name='ldapBindUserDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
<variable name='nginxBucketSize'>server_names_hash_bucket_size Taille du hash des noms de serveur pour NGINX</variable>
<variable name='llCheckLogins'>Affiche une case à cocher sur la mire SSO qui permet a l'utilisateur de voir l'historique de connection de son compte avant d'être redirigé vers le service demandé</variable>
<variable name='llCSPTargets'>Liste des domaines à ajouter à la directive form-action.</variable>

View File

@ -1,5 +1,8 @@
#!/bin/bash
[[ $(CreoleGet activerLemon non) == "non" ]] && exit 0
# Updating Configuration cache
cmd="/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache"

View File

@ -392,10 +392,12 @@
"oidcOPMetaDataJWKS": null,
"webIDAuthnLevel": 1,
"issuerDBOpenIDActivation": "1",
%if %%is_empty(%%llResetUrl)
%if %%llResetPassword == "oui"
%if %%is_empty(%%llResetUrl)
"mailUrl": "https://%%authWebName/mail.pl",
%else
%else
"mailUrl": "%%llResetUrl",
%end if
%end if
"maintenance": 0,
"jsRedirect": 0,