Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
96d8a8364b
|
@ -8,6 +8,7 @@
|
||||||
<file filelist='lemon' name='/etc/lemonldap-ng/test-nginx.conf' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/etc/lemonldap-ng/test-nginx.conf' mkdir='True' rm='True'/>
|
||||||
<file filelist='lemon' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
|
||||||
<file filelist='lemon' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
|
||||||
|
<file filelist='lemon' name='/etc/default/lemonldap-ng-fastcgi-server' mkdir='True' rm='True'/>
|
||||||
<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/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='/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"/>
|
<file filelist='lemonCAS' name='/etc/pam_cas.conf' source="pam_cas_auth.conf"/>
|
||||||
|
@ -34,6 +35,10 @@
|
||||||
<variable name='ldapBindUserDN' type='string' description="Utilisateur de connection à l'annuaire" mandatory="True"/>
|
<variable name='ldapBindUserDN' type='string' description="Utilisateur de connection à l'annuaire" mandatory="True"/>
|
||||||
<variable name='ldapBindUserPassword' type='string' description="Mot de passe de l'utilisateur de connection à l'annuaire" mandatory="True"/>
|
<variable name='ldapBindUserPassword' type='string' description="Mot de passe de l'utilisateur de connection à l'annuaire" mandatory="True"/>
|
||||||
<variable name="samlOrganizationName" type='string' description="Nom de l'organisation SAML" mode='expert'/>
|
<variable name="samlOrganizationName" type='string' description="Nom de l'organisation SAML" mode='expert'/>
|
||||||
|
<variable name="lemonproc" type='number' description="Nombre de processus dédié à Lemon (équivalent au nombre de processeur)" mandatory="True">
|
||||||
|
<value>4</value>
|
||||||
|
</variable>
|
||||||
|
|
||||||
<variable name="lemonAdmin" type='string' description="LemonLDAP Administrator username" mode='expert'>
|
<variable name="lemonAdmin" type='string' description="LemonLDAP Administrator username" mode='expert'>
|
||||||
<value>admin</value>
|
<value>admin</value>
|
||||||
</variable>
|
</variable>
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Number of process (default: 7)
|
||||||
|
NPROC = %%lemonproc
|
||||||
|
|
||||||
|
# Unix socket to listen to
|
||||||
|
SOCKET=/run/llng-fastcgi-server/llng-fastcgi.sock
|
||||||
|
|
||||||
|
# Pid file
|
||||||
|
PID=/run/llng-fastcgi-server/llng-fastcgi-server.pid
|
||||||
|
|
||||||
|
# User and GROUP
|
||||||
|
USER=www-data
|
||||||
|
GROUP=www-data
|
||||||
|
|
||||||
|
# Custom functions file
|
||||||
|
#CUSTOM_FUNCTIONS_FILE=/var/lib/lemonldap-ng/myfile.pm
|
|
@ -25,6 +25,7 @@ server {
|
||||||
ssl_certificate_key %%server_key;
|
ssl_certificate_key %%server_key;
|
||||||
%end if
|
%end if
|
||||||
ssl_client_certificate /etc/ssl/certs/ca..crt;
|
ssl_client_certificate /etc/ssl/certs/ca..crt;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
access_log /var/log/nginx/auth-lemon-ldap.access-ssl.log;
|
access_log /var/log/nginx/auth-lemon-ldap.access-ssl.log;
|
||||||
server_name %%authWebName;
|
server_name %%authWebName;
|
||||||
root /usr/share/lemonldap-ng/portal/htdocs/;
|
root /usr/share/lemonldap-ng/portal/htdocs/;
|
||||||
|
|
Loading…
Reference in New Issue