Use a macro in Makefile for Apache log dir (#1611)

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/manager-apache2.4.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.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

@@ -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__

_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__

_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__