Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
lemonldap-ng
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
ba7751af
Commit
ba7751af
authored
Jan 10, 2019
by
Clément OUDOT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a macro in Makefile for Apache log dir (#1611)
parent
0dd372e5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
9 deletions
+13
-9
Makefile
Makefile
+4
-0
_example/etc/manager-apache2.4.conf
_example/etc/manager-apache2.4.conf
+2
-2
_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
+1
-1
_example/etc/portal-apache2.X.conf
_example/etc/portal-apache2.X.conf
+1
-1
_example/etc/portal-apache2.conf
_example/etc/portal-apache2.conf
+1
-1
No files found.
Makefile
View file @
ba7751af
...
...
@@ -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
View file @
ba7751af
...
...
@@ -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
View file @
ba7751af
...
...
@@ -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 @
ba7751af
...
...
@@ -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 @
ba7751af
...
...
@@ -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
View file @
ba7751af
...
...
@@ -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
View file @
ba7751af
...
...
@@ -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__
...
...
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