X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor-server.init;h=098ecbad4f67e9832f3f31f5a45b4db9080221ff;hp=c477c89a743ca458faa70b69028d5f871e6121e0;hb=5beeef6caa515277a91a7fe91e84d9d6ed3cafdf;hpb=9a3f616ba7f24ef6dd9b0de395ba7d997c273a13

diff --git a/monitor-server.init b/monitor-server.init
index c477c89..098ecba 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -246,22 +246,25 @@ function create_httpd_conf ()
 	# TODO: make proxy port configurable.
 
 	cat <<EOF > ${MONITOR_HTTP_CONF}
-NameVirtualHost ${PLC_MONITOR_IP}:80
+NameVirtualHost *
 
-<VirtualHost ${PLC_MONITOR_IP}:80>
+<VirtualHost *>
     ServerName ${PLC_MONITOR_HOST}
     ServerAdmin ${PLC_MONITOR_EMAIL}
     UseCanonicalName Off
     ServerSignature Off
 
-    DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb
-
-    <Directory "${MONITORPATH}/web/MonitorWeb/monitorweb">
-        Options Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
+	# NOTE: this appears to alter the global document root, for port 80...
+	#  not sure if it's possible to serve two different 'virtualhosts' from
+	#  the same port and same hostname with different document roots...
+    #DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb
+
+    #<Directory "${MONITORPATH}/web/MonitorWeb/monitorweb">
+    #    Options Indexes FollowSymLinks
+    #    AllowOverride None
+    #    Order allow,deny
+    #    Allow from all
+    #</Directory>
 
     #LogLevel debug
     Errorlog /var/log/httpd/monitorwebapp-error_log