Commit 6b262e8d authored by Christophe Maudoux's avatar Christophe Maudoux

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

parents 70289c37 96af2125
...@@ -111,6 +111,9 @@ UWSGIGROUP=$(APACHEGROUP) ...@@ -111,6 +111,9 @@ UWSGIGROUP=$(APACHEGROUP)
# Apache version # Apache version
APACHEVERSION=2.X APACHEVERSION=2.X
# Apache log dir
APACHELOGDIR=/var/log/apache2
# DNS Domain for cookie and virtual hosts # DNS Domain for cookie and virtual hosts
DNSDOMAIN=example.com DNSDOMAIN=example.com
...@@ -712,6 +715,7 @@ install_webserver_conf: ...@@ -712,6 +715,7 @@ install_webserver_conf:
s#__MANAGERSITEDIR__#$(MANAGERSITEDIR)/#g; \ s#__MANAGERSITEDIR__#$(MANAGERSITEDIR)/#g; \
s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \ s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \
s#__TESTDIR__#$(TESTDIR)/#g; \ s#__TESTDIR__#$(TESTDIR)/#g; \
s#__APACHELOGDIR__#$(APACHELOGDIR)#g; \
s#__PORT__#$(PORT)#g; \ s#__PORT__#$(PORT)#g; \
s#__CONFDIR__#$(CONFDIR)#g; \ s#__CONFDIR__#$(CONFDIR)#g; \
s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g; \ s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g; \
......
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
# IMPORTANT: # IMPORTANT:
# To protect applications, see test-apache.conf template in example files # To protect applications, see test-apache.conf template in example files
# Uncomment this if no previous NameVirtualHost declaration
#NameVirtualHost __VHOSTLISTEN__
# Load LemonLDAP::NG Handler # Load LemonLDAP::NG Handler
PerlOptions +GlobalRequest PerlOptions +GlobalRequest
PerlModule Lemonldap::NG::Handler::ApacheMP2 PerlModule Lemonldap::NG::Handler::ApacheMP2
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
# Apache configuration for LemonLDAP::NG Manager # 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 # To insert LLNG user id in Apache logs, declare this format and use it in
# CustomLog directive # CustomLog directive
#LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
...@@ -14,8 +11,8 @@ ...@@ -14,8 +11,8 @@
ServerName manager.__DNSDOMAIN__ ServerName manager.__DNSDOMAIN__
LogLevel notice LogLevel notice
# See above to set LLNG user id in Apache logs # See above to set LLNG user id in Apache logs
#CustomLog ${APACHE_LOG_DIR}/manager.log llng #CustomLog __APACHELOGDIR__/manager.log llng
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log #ErrorLog __APACHELOGDIR__/lm_err.log
# FASTCGI CONFIGURATION # FASTCGI CONFIGURATION
# --------------------- # ---------------------
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
ServerName manager.__DNSDOMAIN__ ServerName manager.__DNSDOMAIN__
LogLevel notice LogLevel notice
# See above to set LLNG user id in Apache logs # See above to set LLNG user id in Apache logs
#CustomLog ${APACHE_LOG_DIR}/manager.log llng #CustomLog __APACHELOGDIR__/manager.log llng
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log #ErrorLog __APACHELOGDIR__/lm_err.log
# FASTCGI CONFIGURATION # FASTCGI CONFIGURATION
# --------------------- # ---------------------
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
ServerName manager.__DNSDOMAIN__ ServerName manager.__DNSDOMAIN__
LogLevel notice LogLevel notice
# See above to set LLNG user id in Apache logs # See above to set LLNG user id in Apache logs
#CustomLog ${APACHE_LOG_DIR}/manager.log llng #CustomLog __APACHELOGDIR__/manager.log llng
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log #ErrorLog __APACHELOGDIR__/lm_err.log
# FASTCGI CONFIGURATION # FASTCGI CONFIGURATION
# --------------------- # ---------------------
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
# Apache configuration for LemonLDAP::NG Portal # 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 # To insert LLNG user id in Apache logs, declare this format and use it in
# CustomLog directive # CustomLog directive
#LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
...@@ -13,7 +10,7 @@ ...@@ -13,7 +10,7 @@
<VirtualHost __VHOSTLISTEN__> <VirtualHost __VHOSTLISTEN__>
ServerName auth.__DNSDOMAIN__ ServerName auth.__DNSDOMAIN__
# See above to set LLNG user id in Apache logs # 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 (FCGI scripts)
DocumentRoot __PORTALSITEDIR__ DocumentRoot __PORTALSITEDIR__
...@@ -46,7 +43,7 @@ ...@@ -46,7 +43,7 @@
#FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321 #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
# Static files # Static files
Alias /static/ __PORTALSTATICDIR__/ Alias /static/ __PORTALSTATICDIR__
<Directory __PORTALSTATICDIR__> <Directory __PORTALSTATICDIR__>
Require all granted Require all granted
Options +FollowSymLinks Options +FollowSymLinks
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<VirtualHost __VHOSTLISTEN__> <VirtualHost __VHOSTLISTEN__>
ServerName auth.__DNSDOMAIN__ ServerName auth.__DNSDOMAIN__
# See above to set LLNG user id in Apache logs # 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 (FCGI scripts)
DocumentRoot __PORTALSITEDIR__ DocumentRoot __PORTALSITEDIR__
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321 #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
# Static files # Static files
Alias /static/ __PORTALSTATICDIR__/ Alias /static/ __PORTALSTATICDIR__
<Directory __PORTALSTATICDIR__> <Directory __PORTALSTATICDIR__>
Require all granted Require all granted
Options +FollowSymLinks Options +FollowSymLinks
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<VirtualHost __VHOSTLISTEN__> <VirtualHost __VHOSTLISTEN__>
ServerName auth.__DNSDOMAIN__ ServerName auth.__DNSDOMAIN__
# See above to set LLNG user id in Apache logs # 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 (FCGI scripts)
DocumentRoot __PORTALSITEDIR__ DocumentRoot __PORTALSITEDIR__
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321 #FcgidInitialEnv LLNGSTATUSHOST 127.0.0.1:64321
# Static files # Static files
Alias /static/ __PORTALSTATICDIR__/ Alias /static/ __PORTALSTATICDIR__
<Directory __PORTALSTATICDIR__> <Directory __PORTALSTATICDIR__>
Order allow,deny Order allow,deny
Allow from all Allow from all
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Apache configuration for LemonLDAP::NG sample applications # Apache configuration for LemonLDAP::NG sample applications
#==================================================================== #====================================================================
# Uncomment this if no previous NameVirtualHost declaration
#NameVirtualHost __VHOSTLISTEN__
PerlModule Lemonldap::NG::Handler::ApacheMP2::Menu PerlModule Lemonldap::NG::Handler::ApacheMP2::Menu
# Sample application # Sample application
......
lemonldap-ng (2.1.0) artful; urgency=medium
lemonldap-ng (2.0.1) artful; urgency=medium lemonldap-ng (2.0.1) artful; urgency=medium
* Bugs: * Bugs:
......
...@@ -387,6 +387,7 @@ This package installs the authentication portal. ...@@ -387,6 +387,7 @@ This package installs the authentication portal.
ETCDEFAULTDIR=%{_sysconfdir}/default \ ETCDEFAULTDIR=%{_sysconfdir}/default \
DNSDOMAIN=%{lm_dnsdomain} \ DNSDOMAIN=%{lm_dnsdomain} \
APACHEVERSION=%{apache_version} \ APACHEVERSION=%{apache_version} \
APACHELOGDIR=/var/log/httpd \
UWSGIYAMLDIR=%{_sysconfdir}/uwsgi/apps-available \ UWSGIYAMLDIR=%{_sysconfdir}/uwsgi/apps-available \
LLNGAPPDIR=%{lm_sharedir}/llng-server \ LLNGAPPDIR=%{lm_sharedir}/llng-server \
PROD=yes PROD=yes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment