ocket8888 commented on code in PR #7389: URL: https://github.com/apache/trafficcontrol/pull/7389#discussion_r1131207437
########## infrastructure/cdn-in-a-box/traffic_portal_v2/run.sh: ########## @@ -0,0 +1,69 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +INIT_DIR="/etc/init.d" + +set-dns.sh +insert-self-into-dns.sh + +source /to-access.sh + +# Wait on SSL certificate generation +until [[ -f "$X509_CA_ENV_FILE" ]] +do + echo "Waiting on Shared SSL certificate generation" + sleep 3 +done + +# Source the CIAB-CA shared SSL environment +until [[ -n "$X509_GENERATION_COMPLETE" ]] +do + echo "Waiting on X509 vars to be defined" + sleep 1 + source "$X509_CA_ENV_FILE" +done + +# Trust the CIAB-CA at the System level +cp $X509_CA_CERT_FULL_CHAIN_FILE /etc/pki/ca-trust/source/anchors +update-ca-trust extract + +# Configuration of Traffic Portal +key=$X509_INFRA_KEY_FILE +cert=$X509_INFRA_CERT_FILE +ca=/etc/pki/tls/certs/ca-bundle.crt + +echo "$(jq "$(<<JQ_FILTERS cat + .trafficOps = "https://$TO_FQDN:$TO_PORT/api"; | + .certPath = "$cert" | + .keyPath = "$key" | + .port = 443 | + .insecure = true +JQ_FILTERS +)" /etc/traffic-portal/config.json )" > /etc/traffic-portal/config.json + +echo "TO_HOST: $TO_HOST" +echo "TO_HOST: $TO_PORT" +echo "TO_FQDN: $TO_FQDN" + +# Enroll the Traffic Portal +to-enroll "tpv2" ALL || (while true; do echo "enroll failed."; sleep 3 ; done) Review Comment: I know this is standard in CiaB, but IMO it'd better to just `set -e` and let it fail if it fails. ########## infrastructure/cdn-in-a-box/traffic_portal_v2/run.sh: ########## @@ -0,0 +1,69 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +INIT_DIR="/etc/init.d" + +set-dns.sh +insert-self-into-dns.sh + +source /to-access.sh + +# Wait on SSL certificate generation +until [[ -f "$X509_CA_ENV_FILE" ]] +do + echo "Waiting on Shared SSL certificate generation" + sleep 3 +done + +# Source the CIAB-CA shared SSL environment +until [[ -n "$X509_GENERATION_COMPLETE" ]] +do + echo "Waiting on X509 vars to be defined" + sleep 1 + source "$X509_CA_ENV_FILE" +done + +# Trust the CIAB-CA at the System level +cp $X509_CA_CERT_FULL_CHAIN_FILE /etc/pki/ca-trust/source/anchors +update-ca-trust extract + +# Configuration of Traffic Portal +key=$X509_INFRA_KEY_FILE +cert=$X509_INFRA_CERT_FILE +ca=/etc/pki/tls/certs/ca-bundle.crt + +echo "$(jq "$(<<JQ_FILTERS cat + .trafficOps = "https://$TO_FQDN:$TO_PORT/api"; | + .certPath = "$cert" | + .keyPath = "$key" | + .port = 443 | + .insecure = true +JQ_FILTERS +)" /etc/traffic-portal/config.json )" > /etc/traffic-portal/config.json + +echo "TO_HOST: $TO_HOST" +echo "TO_HOST: $TO_PORT" +echo "TO_FQDN: $TO_FQDN" Review Comment: Are these necessary? ########## infrastructure/cdn-in-a-box/traffic_ops/to-access.sh: ########## @@ -244,6 +244,11 @@ to-enroll() { export MY_PROFILE="TRAFFIC_PORTAL" export MY_STATUS="ONLINE" ;; + "tpv2" ) + export MY_TYPE="TRAFFIC_PORTAL" + export MY_PROFILE="TRAFFIC_PORTAL" + export MY_STATUS="ONLINE" + ;; Review Comment: This section is identical to the one for `tp` - why not just re-use that one? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
