diff --git a/dicos/70_lemonldap_ng.xml b/dicos/70_lemonldap_ng.xml index e32d677..39d3226 100644 --- a/dicos/70_lemonldap_ng.xml +++ b/dicos/70_lemonldap_ng.xml @@ -3,9 +3,12 @@ <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +>>>>>>> master +======= >>>>>>> master @@ -53,46 +56,13 @@ -======= - - - - - - - - - - - - lemonldap-ng-fastcgi-server - - 80 - 443 - - - - - - non - - - - - - - --> - - - - - - - ->>>>>>> 70a1c26 (Fix disable if in) 4 + + info + + admin @@ -159,6 +129,10 @@ ['ldaps','ldap'] + + ['info','notice','warn','error','debug' + + ['LDAP','Demo','Custom'] diff --git a/tmpl/lemonldap-ng.ini b/tmpl/lemonldap-ng.ini index 0f497ae..25e511c 100644 --- a/tmpl/lemonldap-ng.ini +++ b/tmpl/lemonldap-ng.ini @@ -36,7 +36,7 @@ ; ; 1 - Defined logging level ; Set here one of error, warn, notice, info or debug -logLevel = debug +logLevel = %%lm_loglevel ; Note that this has no effect for Apache2 logging: Apache LogLevel is used ; instead ; @@ -65,9 +65,9 @@ logLevel = debug ; 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 ;