projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e7b6e01
)
change template language to standard apache
author
Wolfram Schneider
<wosch@indexdata.dk>
Mon, 7 Apr 2014 14:14:34 +0000
(14:14 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Mon, 7 Apr 2014 14:14:34 +0000
(14:14 +0000)
tools/apache2/jasmine-dev.template
patch
|
blob
|
history
diff --git
a/tools/apache2/jasmine-dev.template
b/tools/apache2/jasmine-dev.template
index
defa2d9
..
2c7d969
100644
(file)
--- a/
tools/apache2/jasmine-dev.template
+++ b/
tools/apache2/jasmine-dev.template
@@
-1,20
+1,24
@@
# Configuration for the apache web server -*- apache -*-
# Configuration for the apache web server -*- apache -*-
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+PidFile ${APACHE_PID_FILE}
+
# pazpar2 / service proxy config
<VirtualHost *:4040>
ServerName localhost
ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com mkws-dev.indexdata.com 127.0.0.1
ServerAdmin webmaster@indexdata.com
# pazpar2 / service proxy config
<VirtualHost *:4040>
ServerName localhost
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%/mkws-dev-error.log
- CustomLog %APACHE_LOG%/mkws-dev-access.log combined
+ ErrorLog ${APACHE_LOG_DIR}/mkws-dev-error.log
+ CustomLog ${APACHE_LOG_DIR}/mkws-dev-access.log combined
RewriteEngine on
RewriteLogLevel 1
RewriteEngine on
RewriteLogLevel 1
- RewriteLog %APACHE_LOG%/mkws-dev-rewrite.log
+ RewriteLog ${APACHE_LOG_DIR}/mkws-dev-rewrite.log
- DocumentRoot %MKWS_ROOT%/examples/htdocs
- Alias /tools/htdocs %MKWS_ROOT%/tools/htdocs
+ DocumentRoot ${MKWS_ROOT}/examples/htdocs
+ Alias /tools/htdocs ${MKWS_ROOT}/tools/htdocs
# CORS setting
Header set Access-Control-Allow-Credentials true
# CORS setting
Header set Access-Control-Allow-Credentials true