diff --git a/Makefile b/Makefile index 62c3db7c3eca9c379c256ff99821d1c72160424b..40c54fe168ae65a14b02ecec48646b7f987b26cd 100644 --- a/Makefile +++ b/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; \ diff --git a/_example/etc/handler-apache2.4.conf b/_example/etc/handler-apache2.4.conf index bd29b81b576bbe5e279df8a04df7b494fa7e67d7..4ed8f306cc0a624191e8705b5fedddf35c630450 100644 --- a/_example/etc/handler-apache2.4.conf +++ b/_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 diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf index 6eb15afbf0ed8e3c615ef166c2c9cccb3d8fa134..9fef94926009095b1b3380a101cca61e5e8833f0 100644 --- a/_example/etc/manager-apache2.4.conf +++ b/_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 # --------------------- diff --git a/_example/etc/manager-apache2.X.conf b/_example/etc/manager-apache2.X.conf index 1d665e25f3c7d289df2c75f5de69c26b0af20ef6..a602ed3f33d8cb81ca3890cf80395dc99a13899e 100644 --- a/_example/etc/manager-apache2.X.conf +++ b/_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 # --------------------- diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf index 0377d80f7ab06693aeb687963feea1b650d1e42d..87bde900c78021d544cabdf06fe10e79d9673c03 100644 --- a/_example/etc/manager-apache2.conf +++ b/_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 # --------------------- diff --git a/_example/etc/portal-apache2.4.conf b/_example/etc/portal-apache2.4.conf index be331b814d0c27b4531aabbf7fdee093209d54f0..a91a99610f079eba1ae1dd697c8bdeeeb17cd2ea 100644 --- a/_example/etc/portal-apache2.4.conf +++ b/_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 @@ 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__ Require all granted Options +FollowSymLinks diff --git a/_example/etc/portal-apache2.X.conf b/_example/etc/portal-apache2.X.conf index 708e373641fa1690bdb5072ecf1cf95ac610a292..e843e370663e2174c95be0c4eacfdecb0ca34b2f 100644 --- a/_example/etc/portal-apache2.X.conf +++ b/_example/etc/portal-apache2.X.conf @@ -13,7 +13,7 @@ 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__ Require all granted Options +FollowSymLinks diff --git a/_example/etc/portal-apache2.conf b/_example/etc/portal-apache2.conf index be62f0d06dc5a5c2ac26cdb234b19e6f119a90b5..0c9122ab8407c6861192d82223b3ab2aaeb478cf 100644 --- a/_example/etc/portal-apache2.conf +++ b/_example/etc/portal-apache2.conf @@ -13,7 +13,7 @@ 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__ Order allow,deny Allow from all diff --git a/_example/etc/test-apache2.4.conf b/_example/etc/test-apache2.4.conf index 8f8c5471d3999524751927df6a7fc46b50d71cc2..ebc2cdb826258a54d6fd0288a669d80496fabd0e 100644 --- a/_example/etc/test-apache2.4.conf +++ b/_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 diff --git a/changelog b/changelog index 96995fcffbd033b7f393db9d55e3d0262bed2f49..a9b16e8d05d997f4ea51aec805f37176b695fbe7 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,3 @@ -lemonldap-ng (2.1.0) artful; urgency=medium - - lemonldap-ng (2.0.1) artful; urgency=medium * Bugs: diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index b317e26561c70ba5dc82ac96ec183040b8c58918..350d44d0d076f0f9cbd0f645025066c247a20120 100644 --- a/rpm/lemonldap-ng.spec +++ b/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