git://git.onelab.eu / monitor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9a3f616)
previous conf.d/monitorweb.conf moved the documentroot and failed to load the
authorStephen Soltesz <soltesz@cs.princeton.edu>
Wed, 3 Dec 2008 19:26:18 +0000 (19:26 +0000)
committerStephen Soltesz <soltesz@cs.princeton.edu>
Wed, 3 Dec 2008 19:26:18 +0000 (19:26 +0000)
standard myplc webpage at /.

monitor-server.init patch | blob | history
web/MonitorWeb/monitorweb/templates/sitemenu.kid patch | blob | history
web/monitorweb-httpd.conf patch | blob | history

diff --git a/monitor-server.init b/monitor-server.init
index c477c89..098ecba 100644 (file)
--- 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}
        # 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
 
     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
 
     #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 (file)
--- a/web/MonitorWeb/monitorweb/templates/sitemenu.kid
+++ b/web/MonitorWeb/monitorweb/templates/sitemenu.kid
@@ -10,7 +10,7 @@
 
   <body>
     <div id="header">Monitor : ${page_title}</div>
 
   <body>
     <div id="header">Monitor : ${page_title}</div>
-       <table valign="top" border="1" bgcolor="white" align="center" width="60em">
+       <table valign="top" border="1" bgcolor="white" align="center" width="700px">
        <tr>
                <td>
                        <table id="nps-table" width="100%">
        <tr>
                <td>
                        <table id="nps-table" width="100%">
diff --git a/web/monitorweb-httpd.conf b/web/monitorweb-httpd.conf
index a1935ae..1ee0e3b 100644 (file)
--- a/web/monitorweb-httpd.conf
+++ b/web/monitorweb-httpd.conf
@@ -1,19 +1,19 @@
-NameVirtualHost 128.112.139.116:80
+NameVirtualHost *
 
 
-<VirtualHost 128.112.139.116:80>
+<VirtualHost *>
     ServerName pl-virtual-06.cs.princeton.edu
     ServerAdmin soltesz@cs.princeton.edu
     UseCanonicalName Off
     ServerSignature Off
 
     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
 
 
-    <Directory "/usr/share/monitor/web/MonitorWeb/monitorweb">
-        Options Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
+    #<Directory "/usr/share/monitor/web/MonitorWeb/monitorweb">
+    #    Options Indexes FollowSymLinks
+    #    AllowOverride None
+    #    Order allow,deny
+    #    Allow from all
+    #</Directory>
 
     Errorlog /var/log/httpd/monitorwebapp-error_log
     Customlog /var/log/httpd/monitorwebapp-access_log common
 
     Errorlog /var/log/httpd/monitorwebapp-error_log
     Customlog /var/log/httpd/monitorwebapp-access_log common
monitor