From: Stephen Soltesz Date: Wed, 3 Dec 2008 19:26:18 +0000 (+0000) Subject: previous conf.d/monitorweb.conf moved the documentroot and failed to load the X-Git-Tag: Monitor-2.0-0~16 X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=5beeef6caa515277a91a7fe91e84d9d6ed3cafdf previous conf.d/monitorweb.conf moved the documentroot and failed to load the standard myplc webpage at /. --- 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 < ${MONITOR_HTTP_CONF} -NameVirtualHost ${PLC_MONITOR_IP}:80 +NameVirtualHost * - + ServerName ${PLC_MONITOR_HOST} ServerAdmin ${PLC_MONITOR_EMAIL} UseCanonicalName Off ServerSignature Off - DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb - - - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - + # 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 + + # + # Options Indexes FollowSymLinks + # AllowOverride None + # Order allow,deny + # Allow from all + # #LogLevel debug Errorlog /var/log/httpd/monitorwebapp-error_log diff --git a/web/MonitorWeb/monitorweb/templates/sitemenu.kid b/web/MonitorWeb/monitorweb/templates/sitemenu.kid index 3d15356..262005a 100644 --- a/web/MonitorWeb/monitorweb/templates/sitemenu.kid +++ b/web/MonitorWeb/monitorweb/templates/sitemenu.kid @@ -10,7 +10,7 @@ - +

diff --git a/web/monitorweb-httpd.conf b/web/monitorweb-httpd.conf index a1935ae..1ee0e3b 100644 --- a/web/monitorweb-httpd.conf +++ b/web/monitorweb-httpd.conf @@ -1,19 +1,19 @@ -NameVirtualHost 128.112.139.116:80 +NameVirtualHost * - + ServerName pl-virtual-06.cs.princeton.edu ServerAdmin soltesz@cs.princeton.edu UseCanonicalName Off ServerSignature Off - DocumentRoot /usr/share/monitor/web/MonitorWeb/monitorweb + #DocumentRoot /usr/share/monitor/web/MonitorWeb/monitorweb - - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - + # + # Options Indexes FollowSymLinks + # AllowOverride None + # Order allow,deny + # Allow from all + # Errorlog /var/log/httpd/monitorwebapp-error_log Customlog /var/log/httpd/monitorwebapp-access_log common