Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
6b262e8d
Commit
6b262e8d
authored
Jan 10, 2019
by
Christophe Maudoux
🐛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0
parents
70289c37
96af2125
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
26 deletions
+17
-26
Makefile
Makefile
+4
-0
_example/etc/handler-apache2.4.conf
_example/etc/handler-apache2.4.conf
+0
-3
_example/etc/manager-apache2.4.conf
_example/etc/manager-apache2.4.conf
+2
-5
_example/etc/manager-apache2.X.conf
_example/etc/manager-apache2.X.conf
+2
-2
_example/etc/manager-apache2.conf
_example/etc/manager-apache2.conf
+2
-2
_example/etc/portal-apache2.4.conf
_example/etc/portal-apache2.4.conf
+2
-5
_example/etc/portal-apache2.X.conf
_example/etc/portal-apache2.X.conf
+2
-2
_example/etc/portal-apache2.conf
_example/etc/portal-apache2.conf
+2
-2
_example/etc/test-apache2.4.conf
_example/etc/test-apache2.4.conf
+0
-2
changelog
changelog
+0
-3
rpm/lemonldap-ng.spec
rpm/lemonldap-ng.spec
+1
-0
No files found.
Makefile
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
...
...
@@ -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
View file @
6b262e8d
lemonldap-ng (2.1.0) artful; urgency=medium
lemonldap-ng (2.0.1) artful; urgency=medium
* Bugs:
...
...
rpm/lemonldap-ng.spec
View file @
6b262e8d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment