Make eole-lemonldap-ng compatible with eolebase

.gitignore

@@ -1,4 +0,0 @@
-# Backup and swap files
-*~
-*#
-*.swp

Makefile

@@ -3,9 +3,9 @@
 ################################
 
 SOURCE=eole-lemonldap
-VERSION=2.8
+VERSION=2.8.0
 EOLE_VERSION=2.8
-EOLE_RELEASE=2.8.1
+EOLE_RELEASE=2.8.0
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -4,27 +4,6 @@ LemonLDAP::NG EOLE integration
 
 ## Howto
 
-### Repository configuration
-
-* Add the lemonldap-ng deb respository we need the last version of LemonLDAP.
-
-GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
-
-#### 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
-* Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 
-
-#### Cadoles Repository
-* deb [ arch=all  ] https://vulcain.cadoles.com 2.7.2-dev main
-* Key URL : https://vulcain.cadoles.com/cadoles.gpg
-
-### Install packages
-
-apt update
-apt install eole-lemonldap
-
 ### Configure LemonLDAP in GenConfig
 
 * Enable lemonldap in "Services" tab

dicos/70_lemonldap_ng.xml

@@ -2,6 +2,7 @@
 <creole>
 
     <files>
+
         <file filelist='lemonldap' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/etc/default/lemonldap-ng-fastcgi-server' mkdir='True' rm='True'/>
@@ -14,7 +15,7 @@
         <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/handler-apache2.X.conf' mkdir='True' rm='True'/>
         <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/portal-apache2.X.conf' mkdir='True' rm='True'/>
 
-        <service servicelist="sllemon">lemonldap-ng-fastcgi-server</service>
+        <service>lemonldap-ng-fastcgi-server</service>
 
         <service method='apache' servicelist='lemonldap-apache'>manager-apache2</service>
         <service method='apache' servicelist='lemonldap-apache'>portal-apache2</service>
@@ -51,10 +52,6 @@
                 <value>4</value>
             </variable>
 
-            <variable name="lm_loglevel" type='string' description="Verbosité des journaux" mode='expert'>
-                <value>info</value>
-            </variable>
-
             <variable name="lemonAdmin" type='string' description="LemonLDAP Administrator username" mode='expert'>
                 <value>admin</value>
             </variable>
@@ -121,13 +118,10 @@
             <param>['ldaps','ldap']</param>
         </check>
 
-        <check name='valid_enum' target="lm_loglevel">
-            <param>['info','notice','warn','error','debug'</param>
-        </check>
-
         <check name="valid_enum" target="llRegisterDB">
             <param>['LDAP','Demo','Custom']</param>
         </check>
+
         <group master="casAttribute">
             <slave>casLDAPAttribute</slave>
         </group>
@@ -138,7 +132,6 @@
             <target type='filelist'>lemonldap-nginx</target>
             <target type='filelist'>lemonldap-apache</target>
             <target type='servicelist'>lemonldap-apache</target>
-            <target type='servicelist'>sllemon</target>
             <target type='family'>LemonLDAP</target>
             <target type='service_accesslist'>saLemon</target>
         </condition>

postservice/99-lemonldap-ng

@@ -1,12 +1,6 @@
 #!/bin/bash
 
-
-[[ $(CreoleGet activerLemon non) == "non" ]] && exit 0
-
-# Updating Configuration cache
-
-cmd="/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache"
-opt="update-cache"
+[ "$(CreoleGet activerLemon non)" = 'oui' ] || exit 0
 
 # Updating Configuration cache
 /usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache 2>&1

tmpl/lemonldap-ng.ini

@@ -36,7 +36,7 @@
 ;
 ; 1 - Defined logging level
 ;   Set here one of error, warn, notice, info or debug
-logLevel     = %%lm_loglevel
+logLevel     = debug
 ; Note that this has no effect for Apache2 logging: Apache LogLevel is used
 ; instead
 ;
@@ -65,9 +65,9 @@ logLevel     = %%lm_loglevel
 ; 2.1 - Using Syslog
 ;
 ;   For Syslog logging, you can also overwrite facilities. Default values:
-logger             = Lemonldap::NG::Common::Logger::Syslog
-syslogFacility     = daemon
-userSyslogFacility = auth
+;logger             = Lemonldap::NG::Common::Logger::Syslog
+;syslogFacility     = daemon
+;userSyslogFacility = auth
 ;
 ; 2.2 - Using Log4perl
 ;

tmpl/nginx-lmlog.conf

@@ -1,3 +1,3 @@
-log_format lm_app '$remote_addr - $upstream_http_lm_remote_user [$time_local] '
+log_format lm_combined '$remote_addr - $lmremote_user [$time_local] '
 	'"$request" $status $body_bytes_sent '
-	'"$http_referer" "$http_user_agent" $upstream_http_lm_remote_custom';
+	'"$http_referer" "$http_user_agent"';