diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-06-10 12:27:14 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-06-10 12:27:14 +0530 |
| commit | 3c5b8b46c2f64e36efb6df938bd2d02c7475ecfc (patch) | |
| tree | 2dabb34d44a6339e7212860ec7eea7a0f77526db /src/com.gluster.storage.management.server/WebContent | |
| parent | 15a7ee0377df78abd5ee28f6fd47d0d53e1a392e (diff) | |
| parent | 5e1b12890c6ad6e6fe3bb17589550dfd74f89344 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.server/WebContent')
5 files changed, 28 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml index 7c7d42d3..4aaa3c9b 100644 --- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml +++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml @@ -3,7 +3,7 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"> - <display-name>com.gluster.storage.management.server</display-name> + <display-name>glustermg</display-name> <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> @@ -81,4 +81,14 @@ <filter-name>springSecurityFilterChain</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Gluster Management Gateway</web-resource-name> + <url-pattern>/*</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> +</security-constraint> </web-app> diff --git a/src/com.gluster.storage.management.server/WebContent/index.html b/src/com.gluster.storage.management.server/WebContent/index.html new file mode 100644 index 00000000..4c90162a --- /dev/null +++ b/src/com.gluster.storage.management.server/WebContent/index.html @@ -0,0 +1,8 @@ +<html> +<head> +<title>Gluster Management Console</title> +</head> +<body> +TODO: Identify the client's platform-browser and invoke appropriate JNLP URL. +</body> +</html> diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py index 9ae53491..877c6c68 100644 --- a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py +++ b/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py @@ -64,7 +64,7 @@ WEBDAV_DOCUMENT_ROOT_DIR = "/var/www/html" UPDATES_DIR = "/UPDATES" TRANSPORT_HOME_DIR = "/transport" GLUSTERFS_LOG_DIR = "/var/log/glusterfs" -LOG_DIR = "/var/log/glustermc" +LOG_DIR = "/var/log/glustermg" GLUSTER_UPDATES_FILE = "updates.xml" INSTALLER_STATUS_FILE = "/var/log/install-server-status.log" diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py index 6ac15fed..80e6101c 100755 --- a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py +++ b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py @@ -23,6 +23,8 @@ import struct import syslog import Globals import Common +import time +from XmlHandler import * class TimeoutException(Exception): pass @@ -50,7 +52,12 @@ def serverDiscoveryRequest(multiCastGroup, port): while True: response = socketReceive.recvfrom(200) if response and response[0].upper() != "SERVERDISCOVERY": - servers.append(response[0]) + dom = XDOM() + dom.parseString(response[0]) + responsetime = dom.getTextByTagRoute("response.time") + servername = dom.getTextByTagRoute("response.servername") + if time.time() - float(responsetime) < 60: + servers.append(servername) signal.signal(signal.SIGALRM, timeoutSignal) signal.alarm(3) except TimeoutException: diff --git a/src/com.gluster.storage.management.server/WebContent/ssl/gmg-ssl.keystore b/src/com.gluster.storage.management.server/WebContent/ssl/gmg-ssl.keystore Binary files differnew file mode 100644 index 00000000..2efe19b0 --- /dev/null +++ b/src/com.gluster.storage.management.server/WebContent/ssl/gmg-ssl.keystore |