Bug 9479 - provide option for built in https

frank-zhang · frank-zhang · commit 57dbe64f9e15 · 2011-09-01T17:45:18.000-07:00
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
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
@@ -70,8 +70,8 @@ def config(self):
                 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")
