projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use protocol independent URL for fonts, MKWS-395
[mkws-moved-to-github.git]
/
tools
/
apache2
/
jasmine-dev.template-2.4
diff --git
a/tools/apache2/jasmine-dev.template-2.4
b/tools/apache2/jasmine-dev.template-2.4
index
6d91adf
..
30a87b8
100644
(file)
--- a/
tools/apache2/jasmine-dev.template-2.4
+++ b/
tools/apache2/jasmine-dev.template-2.4
@@
-1,12
+1,13
@@
# Configuration for the apache web server -*- apache -*-
#####################################################################
# Configuration for the apache web server -*- apache -*-
#####################################################################
-# global apache2 config
+# global apache 2.4 config
#
User ${APACHE_RUN_USER}
Group ${APACHE_RUN_GROUP}
PidFile ${APACHE_PID_FILE}
Mutex file:${APACHE_LOG_DIR}
#
User ${APACHE_RUN_USER}
Group ${APACHE_RUN_GROUP}
PidFile ${APACHE_PID_FILE}
Mutex file:${APACHE_LOG_DIR}
+ErrorLog ${APACHE_LOG_DIR}/error-${APACHE_PORT}.log
ServerName localhost
ServerRoot ${APACHE_SERVER_ROOT}
ServerName localhost
ServerRoot ${APACHE_SERVER_ROOT}
@@
-24,8
+25,8
@@
Include ${APACHE_MODULES}
ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com mkws-dev.indexdata.com 127.0.0.1
ServerAdmin webmaster@indexdata.com
ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com mkws-dev.indexdata.com 127.0.0.1
ServerAdmin webmaster@indexdata.com
- ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-error.log
- CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access.log combined
+ ErrorLog ${APACHE_LOG_DIR}/mkws-jasmine-error-${APACHE_PORT}.log
+ CustomLog ${APACHE_LOG_DIR}/mkws-jasmine-access-${APACHE_PORT}.log combined
LogLevel info rewrite:debug
RewriteEngine on
LogLevel info rewrite:debug
RewriteEngine on