From 57dbe64f9e157f75f2deb8f34d02441e5a80c32e Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 1 Sep 2011 17:45:18 -0700 Subject: [PATCH] Bug 9479 - provide option for built in https Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 change iptable rule --- python/lib/cloudutils/serviceConfigServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py index 4cb1980c695..f22da8637ce 100644 --- a/python/lib/cloudutils/serviceConfigServer.py +++ b/python/lib/cloudutils/serviceConfigServer.py @@ -70,8 +70,8 @@ class cloudManagementConfig(serviceCfgBase): bash("rm -f /etc/cloud/management/tomcat6.conf") bash("ln -s /etc/cloud/management/server-ssl.xml /etc/cloud/management/server.xml") bash("ln -s /etc/cloud/management/tomcat6-ssl.conf /etc/cloud/management/tomcat6.conf") - if not bash("iptables-save |grep PREROUTING | grep 8443").isSuccess(): - bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 8443") + if not bash("iptables-save |grep PREROUTING | grep 6443").isSuccess(): + bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443") else: if not os.path.exists("/etc/cloud/management/server-nonssl.xml") or not os.path.exists("/etc/cloud/management/tomcat6-nonssl.conf"): raise CloudRuntimeException("Cannot find /etc/cloud/management/server-nonssl.xml or /etc/cloud/management/tomcat6-nonssl.conf, https enables failed")