From d1b3df2b5dc1c4eb7fdb5fc20cf07dd1fa1a6502 Mon Sep 17 00:00:00 2001 From: rodrigo diaz Date: Wed, 19 Jul 2017 20:58:36 -0300 Subject: [PATCH] fixes --- container_files/etc/docker_config/discovery_url.txt | 2 +- container_files/etc/docker_config/docker_config.sh | 1 + container_files/etc/docker_config/entity_id.txt | 2 +- siteadmin-sp-deployment.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/container_files/etc/docker_config/discovery_url.txt b/container_files/etc/docker_config/discovery_url.txt index 6eec3f1..16f26d7 100644 --- a/container_files/etc/docker_config/discovery_url.txt +++ b/container_files/etc/docker_config/discovery_url.txt @@ -1 +1 @@ -https://service1.internet2.edu/shibboleth-ds/index.html \ No newline at end of file +https:\/\/service1.internet2.edu\/shibboleth-ds\/index.html \ No newline at end of file diff --git a/container_files/etc/docker_config/docker_config.sh b/container_files/etc/docker_config/docker_config.sh index ebf46e7..00bb70f 100644 --- a/container_files/etc/docker_config/docker_config.sh +++ b/container_files/etc/docker_config/docker_config.sh @@ -19,3 +19,4 @@ fi sed -e "s/\${entityID}/$entityID/" -e "s/\${discoveryURL}/$discoveryURL/" /etc/docker_config/shibboleth2.xml > /etc/shibboleth/shibboleth2.xml +/opt/bin/httpd-shib-foreground diff --git a/container_files/etc/docker_config/entity_id.txt b/container_files/etc/docker_config/entity_id.txt index 479e06a..9cdd51a 100644 --- a/container_files/etc/docker_config/entity_id.txt +++ b/container_files/etc/docker_config/entity_id.txt @@ -1 +1 @@ -https://fmdev.inc.testbed.tier.internet2.edu/shibboleth \ No newline at end of file +https:\/\/siteadmin.inc.testbed.tier.internet2.edu\/ \ No newline at end of file diff --git a/siteadmin-sp-deployment.yaml b/siteadmin-sp-deployment.yaml index 4d14716..e10a1c6 100644 --- a/siteadmin-sp-deployment.yaml +++ b/siteadmin-sp-deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: siteadmin-sp image: tier/siteadmin-sp - command: ["/opt/bin/httpd-shib-foreground"] + command: ["/bin/bash","/etc/docker_config/docker_config.sh"] ports: - containerPort: 80 protocol: TCP