Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0

Makefile

@@ -111,6 +111,9 @@ UWSGIGROUP=$(APACHEGROUP)
 # Apache version
 APACHEVERSION=2.X
 
+# Apache log dir
+APACHELOGDIR=/var/log/apache2
+
 # DNS Domain for cookie and virtual hosts
 DNSDOMAIN=example.com
 
@@ -712,6 +715,7 @@ install_webserver_conf:
 			s#__MANAGERSITEDIR__#$(MANAGERSITEDIR)/#g; \
 			s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \
 			s#__TESTDIR__#$(TESTDIR)/#g; \
+			s#__APACHELOGDIR__#$(APACHELOGDIR)#g; \
 			s#__PORT__#$(PORT)#g; \
 			s#__CONFDIR__#$(CONFDIR)#g; \
 			s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g; \

_example/etc/handler-apache2.4.conf

@@ -12,9 +12,6 @@
 # IMPORTANT:
 # To protect applications, see test-apache.conf template in example files
 
-# Uncomment this if no previous NameVirtualHost declaration
-#NameVirtualHost __VHOSTLISTEN__
-
 # Load LemonLDAP::NG Handler
 PerlOptions +GlobalRequest
 PerlModule Lemonldap::NG::Handler::ApacheMP2

_example/etc/manager-apache2.4.conf

@@ -2,9 +2,6 @@
 # Apache configuration for LemonLDAP::NG Manager
 #====================================================================
 
-# Uncomment this if no previous NameVirtualHost declaration
-#NameVirtualHost __VHOSTLISTEN__
-
 # To insert LLNG user id in Apache logs, declare this format and use it in
 # CustomLog directive
 #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
@@ -14,8 +11,8 @@
     ServerName manager.__DNSDOMAIN__
     LogLevel notice
     # See above to set LLNG user id in Apache logs
-    #CustomLog ${APACHE_LOG_DIR}/manager.log llng
-    #ErrorLog ${APACHE_LOG_DIR}/lm_err.log
+    #CustomLog __APACHELOGDIR__/manager.log llng
+    #ErrorLog __APACHELOGDIR__/lm_err.log
 
     # FASTCGI CONFIGURATION
     # ---------------------

_example/etc/manager-apache2.X.conf

@@ -14,8 +14,8 @@
     ServerName manager.__DNSDOMAIN__
     LogLevel notice
     # See above to set LLNG user id in Apache logs
-    #CustomLog ${APACHE_LOG_DIR}/manager.log llng
-    #ErrorLog ${APACHE_LOG_DIR}/lm_err.log
+    #CustomLog __APACHELOGDIR__/manager.log llng
+    #ErrorLog __APACHELOGDIR__/lm_err.log
 
     # FASTCGI CONFIGURATION
     # ---------------------

_example/etc/manager-apache2.conf

@@ -14,8 +14,8 @@
     ServerName manager.__DNSDOMAIN__
     LogLevel notice
     # See above to set LLNG user id in Apache logs
-    #CustomLog ${APACHE_LOG_DIR}/manager.log llng
-    #ErrorLog ${APACHE_LOG_DIR}/lm_err.log
+    #CustomLog __APACHELOGDIR__/manager.log llng
+    #ErrorLog __APACHELOGDIR__/lm_err.log
 
     # FASTCGI CONFIGURATION
     # ---------------------

_example/etc/portal-apache2.4.conf

@@ -2,9 +2,6 @@
 # Apache configuration for LemonLDAP::NG Portal
 #====================================================================
 
-# Uncomment this if no previous NameVirtualHost declaration
-#NameVirtualHost __VHOSTLISTEN__
-
 # To insert LLNG user id in Apache logs, declare this format and use it in
 # CustomLog directive
 #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
@@ -13,7 +10,7 @@
 <VirtualHost __VHOSTLISTEN__>
     ServerName auth.__DNSDOMAIN__
     # See above to set LLNG user id in Apache logs
-    #CustomLog /var/log/apache2/portal.log llng
+    #CustomLog __APACHELOGDIR__/portal.log llng
 
     # DocumentRoot (FCGI scripts)
     DocumentRoot __PORTALSITEDIR__
@@ -46,7 +43,7 @@
     #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
 
     # Static files
-    Alias /static/ __PORTALSTATICDIR__/
+    Alias /static/ __PORTALSTATICDIR__
     <Directory __PORTALSTATICDIR__>
         Require all granted
         Options +FollowSymLinks

_example/etc/portal-apache2.X.conf

@@ -13,7 +13,7 @@
 <VirtualHost __VHOSTLISTEN__>
     ServerName auth.__DNSDOMAIN__
     # See above to set LLNG user id in Apache logs
-    #CustomLog /var/log/apache2/portal.log llng
+    #CustomLog __APACHELOGDIR__/portal.log llng
 
     # DocumentRoot (FCGI scripts)
     DocumentRoot __PORTALSITEDIR__
@@ -52,7 +52,7 @@
     #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
 
     # Static files
-    Alias /static/ __PORTALSTATICDIR__/
+    Alias /static/ __PORTALSTATICDIR__
     <Directory __PORTALSTATICDIR__>
         Require all granted
         Options +FollowSymLinks

_example/etc/portal-apache2.conf

@@ -13,7 +13,7 @@
 <VirtualHost __VHOSTLISTEN__>
     ServerName auth.__DNSDOMAIN__
     # See above to set LLNG user id in Apache logs
-    #CustomLog /var/log/apache2/portal.log llng
+    #CustomLog __APACHELOGDIR__/portal.log llng
 
     # DocumentRoot (FCGI scripts)
     DocumentRoot __PORTALSITEDIR__
@@ -47,7 +47,7 @@
     #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
 
     # Static files
-    Alias /static/ __PORTALSTATICDIR__/
+    Alias /static/ __PORTALSTATICDIR__
     <Directory __PORTALSTATICDIR__>
         Order allow,deny
         Allow from all

_example/etc/test-apache2.4.conf

@@ -2,8 +2,6 @@
 # Apache configuration for LemonLDAP::NG sample applications
 #====================================================================
 
-# Uncomment this if no previous NameVirtualHost declaration
-#NameVirtualHost __VHOSTLISTEN__
 PerlModule Lemonldap::NG::Handler::ApacheMP2::Menu
 
 # Sample application

changelog

-lemonldap-ng (2.1.0) artful; urgency=medium
-
-
 lemonldap-ng (2.0.1) artful; urgency=medium
 
   * Bugs:

rpm/lemonldap-ng.spec

@@ -387,6 +387,7 @@ This package installs the authentication portal.
     ETCDEFAULTDIR=%{_sysconfdir}/default \
     DNSDOMAIN=%{lm_dnsdomain} \
     APACHEVERSION=%{apache_version} \
+    APACHELOGDIR=/var/log/httpd \
     UWSGIYAMLDIR=%{_sysconfdir}/uwsgi/apps-available \
     LLNGAPPDIR=%{lm_sharedir}/llng-server \
     PROD=yes