diff custom-vhosts.conf @ 1188:5489ae5ef9e0

Migrate Dockerfile to Debian. This avoids need for custom httpd configuration and certificate problems with curl.
author Tom Gottfried <tom@intevation.de>
date Wed, 07 Sep 2016 12:57:19 +0200
parents 860f03b39a83
children 75e5caebd392
line wrap: on
line diff
--- a/custom-vhosts.conf	Thu Aug 04 17:15:57 2016 +0200
+++ b/custom-vhosts.conf	Wed Sep 07 12:57:19 2016 +0200
@@ -13,7 +13,9 @@
 #
 # You may use the command line option '-S' to verify your virtual host
 # configuration.
-Listen 80
+
+# Listening on port 80 is configured elsewhere in a Debian installation
+#Listen 80
 Listen 81
 Listen 82
 Listen 83
@@ -21,8 +23,8 @@
 
 <VirtualHost *:80>
     ServerAdmin webmaster@localhost
-    ErrorLog logs/lada-error_log
-    CustomLog logs/lada-access_log common
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"
@@ -39,8 +41,8 @@
 
 <VirtualHost *:81>
     ServerAdmin webmaster@localhost
-    ErrorLog logs/lada-error_log
-    CustomLog logs/lada-access_log common
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"
@@ -54,8 +56,8 @@
 
 <VirtualHost *:82>
     ServerAdmin webmaster@localhost
-    ErrorLog logs/lada-error_log
-    CustomLog logs/lada-access_log common
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testnull"
@@ -69,8 +71,8 @@
 
 <VirtualHost *:83>
     ServerAdmin webmaster@localhost
-    ErrorLog logs/lada-error_log
-    CustomLog logs/lada-access_log common
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"
@@ -84,8 +86,8 @@
 
 <VirtualHost *:84>
     ServerAdmin webmaster@localhost
-    ErrorLog logs/lada-error_log
-    CustomLog logs/lada-access_log common
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"

http://lada.wald.intevation.org