You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/06/18 22:43:56 UTC
[trafficcontrol] 09/12: adjustments to get TP and TO talking
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit ddbfa2770679b787e6a4d43a08fc6fe29a55211c
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Mon Jun 18 10:02:14 2018 -0600
adjustments to get TP and TO talking
---
infrastructure/cdn-in-a-box/docker-compose.yml | 2 +-
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 2 +-
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go | 2 +-
infrastructure/cdn-in-a-box/traffic_ops/config.sh | 2 +-
infrastructure/cdn-in-a-box/traffic_portal/run.sh | 2 +-
infrastructure/cdn-in-a-box/variables.env | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml b/infrastructure/cdn-in-a-box/docker-compose.yml
index dac728d..b30967f 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -90,7 +90,7 @@ services:
networks:
- tcnet
ports:
- - "6443:443"
+ - "6443:6443"
build:
context: traffic_ops
dockerfile: Dockerfile-go
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 36b3c06..50ad18d 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -62,7 +62,7 @@ RUN export PERL5LIB=/opt/traffic_ops/app/local/lib/perl5/:/opt/traffic_ops/insta
RUN echo "{\"user\": \"riakuser\",\"password\": \"$TRAFFIC_VAULT_PASS\"}" > /opt/traffic_ops/app/conf/production/riak.conf
-EXPOSE 443
+EXPOSE 6443
WORKDIR /opt/traffic_ops/app
ENV MOJO_MODE production
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
index b8a1fac..96e73a5 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
@@ -28,7 +28,7 @@ RUN mkdir -p /opt/traffic_ops/app/bin /opt/traffic_ops/app/conf/production
COPY --from=trafficops-perl /opt/traffic_ops/app/bin/traffic_ops_golang /opt/traffic_ops/app/bin/traffic_ops_golang
COPY --from=trafficops-perl /usr/local/go /usr/local/go
-EXPOSE 443
+EXPOSE 6443
WORKDIR /opt/traffic_ops/app
ADD config.sh /
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/config.sh b/infrastructure/cdn-in-a-box/traffic_ops/config.sh
index c4714ca..ac08af3 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops/config.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops/config.sh
@@ -59,7 +59,7 @@ cat <<-EOF >/opt/traffic_ops/app/conf/cdn.conf
},
"traffic_ops_golang" : {
"insecure": true,
- "port" : "443",
+ "port" : "6443",
"proxy_timeout" : 60,
"proxy_keep_alive" : 60,
"proxy_tls_timeout" : 60,
diff --git a/infrastructure/cdn-in-a-box/traffic_portal/run.sh b/infrastructure/cdn-in-a-box/traffic_portal/run.sh
index 3429304..dc6423f 100755
--- a/infrastructure/cdn-in-a-box/traffic_portal/run.sh
+++ b/infrastructure/cdn-in-a-box/traffic_portal/run.sh
@@ -18,7 +18,7 @@ openssl req -newkey rsa:2048 -nodes -keyout $key -x509 -days 365 -out $cert -sub
# set configs to point to TO_HOST
-sed -i -e "/^\s*base_url:/ s@'.*'@'https://$TO_HOST'@" /etc/traffic_portal/conf/config.js
+sed -i -e "/^\s*base_url:/ s@'.*'@'https://$TO_HOST:6443/api/'@" /etc/traffic_portal/conf/config.js
props=/opt/traffic_portal/public/traffic_portal_properties.json
tmp=$(mktemp)
diff --git a/infrastructure/cdn-in-a-box/variables.env b/infrastructure/cdn-in-a-box/variables.env
index 6616074..aa2e5ca 100644
--- a/infrastructure/cdn-in-a-box/variables.env
+++ b/infrastructure/cdn-in-a-box/variables.env
@@ -31,7 +31,7 @@ TO_ADMIN_PASSWORD=twelve
TO_ADMIN_USER=admin
TO_EMAIL=cdnadmin@example.com
TO_HOST=trafficops
-TO_PORT=443
+TO_PORT=6443
TO_SECRET=blahblah
TP_EMAIL=none
TP_HOST=trafficportal