[trafficcontrol] 09/20: config fixes

[de...@apache.org]

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 a14fef8a24978cf061db5f00013b0c5ed2efb7b0
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Tue Jun 5 20:01:43 2018 +0000

    config fixes
---
 infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go | 1 +
 infrastructure/cdn-in-a-box/traffic_ops/config.sh     | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
index b270863..b8a1fac 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
@@ -26,6 +26,7 @@ RUN yum -y install nmap-ncat openssl
 
 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
 WORKDIR /opt/traffic_ops/app
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/config.sh b/infrastructure/cdn-in-a-box/traffic_ops/config.sh
index 3c2efe0..6e92c82 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops/config.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops/config.sh
@@ -42,11 +42,14 @@ do
 	if [[ -z $$v ]]; then echo "$v is unset"; exit 1; fi
 done
 
+key=/server.key
+crt=/server.crt
+
 cat <<-EOF >/opt/traffic_ops/app/conf/cdn.conf
 {
     "hypnotoad" : {
         "listen" : [
-            "https://[::]:60443?cert=$crt&key=$key&verify=0x00&ciphers=AES128-GCM-SHA256:HIGH:!RC4:!MD5:!aNULL:!EDH:!ED"
+            "https://trafficops-perl:60443?cert=$crt&key=$key&verify=0x00&ciphers=AES128-GCM-SHA256:HIGH:!RC4:!MD5:!aNULL:!EDH:!ED"
         ],
         "user" : "trafops",
         "group" : "trafops",
@@ -55,6 +58,7 @@ cat <<-EOF >/opt/traffic_ops/app/conf/cdn.conf
         "workers" : 12
     },
     "traffic_ops_golang" : {
+	"insecure": true,
         "port" : "443",
         "proxy_timeout" : 60,
         "proxy_keep_alive" : 60,
@@ -120,8 +124,5 @@ production:
   open: host=$DB_SERVER port=$DB_PORT user=$DB_USER password=$DB_USER_PASS dbname=$DB_NAME sslmode=disable
 EOF
 
-key=/server.key
-crt=/server.crt
-
 openssl req -newkey rsa:2048 -nodes -keyout $key -x509 -days 365 -out $crt -subj "/C=$CERT_COUNTRY/ST=$CERT_STATE/L=$CERT_CITY/O=$CERT_COMPANY"
 chown trafops:trafops $key $crt

-- 
To stop receiving notification emails like this one, please contact
dewrich@apache.org.