You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/02 02:23:23 UTC
stratos git commit: Adding logic to update proxy port in identity
server in wso2is-saml-sso docker image (chamila/imesh)
Repository: stratos
Updated Branches:
refs/heads/master 8f17100c8 -> c73b48c71
Adding logic to update proxy port in identity server in wso2is-saml-sso docker image (chamila/imesh)
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c73b48c7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c73b48c7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c73b48c7
Branch: refs/heads/master
Commit: c73b48c71233b6a0f6e514f9cda2fd4a67a093d1
Parents: 8f17100
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 2 06:53:07 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 2 06:53:07 2015 +0530
----------------------------------------------------------------------
.../packs/plugins/TomcatWSO2ISMetadataPublisher.py | 2 +-
.../service-images/wso2is-saml-sso/Dockerfile | 1 +
.../wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c73b48c7/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py
index 66084d8..b8e5ec0 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py
@@ -36,7 +36,7 @@ class TomcatWSO2ISMetadataPublisher(ICartridgeAgentPlugin):
else:
port_no = payload_ports[1].split(":")[1]
- callback_url = "https://%s:%s/travelocity.com/home.jsp" % (cluster_hostname, port_no)
+ callback_url = "http://%s:%s/travelocity.com/home.jsp" % (cluster_hostname, port_no)
saml_callback_entry = {"key": "CALLBACK_URL", "values": callback_url}
issuer_entry = {"key": "SSO_ISSUER", "values": "travelocity.com"}
# properties_data = [hostname_entry, saml_callback_entry]
http://git-wip-us.apache.org/repos/asf/stratos/blob/c73b48c7/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
index 9b83d8d..b83316d 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
@@ -29,6 +29,7 @@ RUN chmod +x /tmp/env && \
/tmp/env ${JAVA_HOME} ${CARBON_HOME}
ADD files/carbon.xml ${CARBON_HOME}/repository/conf/carbon.xml
+ADD files/catalina-server.xml ${CARBON_HOME}/repository/conf/tomcat/catalina-server.xml
#---------------------------------
# Copy Tomcat related PCA plugins
http://git-wip-us.apache.org/repos/asf/stratos/blob/c73b48c7/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
index f1bdcc4..d2e657d 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
@@ -137,6 +137,12 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin):
output, errors = p.communicate()
log.debug("Set carbon.xml hostname")
+ catalina_replace_command = "sed -i \"s/STRATOS_IS_PROXY_PORT/%s/g\" %s" % (port_no, "${CARBON_HOME}/repository/conf/tomcat/catalina-server.xml")
+
+ p = subprocess.Popen(catalina_replace_command, shell=True)
+ output, errors = p.communicate()
+ log.debug("Set catalina-server.xml proxy port")
+
wso2is_start_command = "exec ${CARBON_HOME}/bin/wso2server.sh start"
env_var = os.environ.copy()
p = subprocess.Popen(wso2is_start_command, env=env_var, shell=True)