PXBF-dev: Undo tome testing changes

.github/workflows/build-and-deploy.yml

@@ -158,7 +158,7 @@ jobs:
           sed -i 's/80/8080/g' Dockerfile-cms
           sed -i 's/ENTRYPOINT/CMD/' Dockerfile-cms
           sed -i 's/\["s3"\]\[\]?/s3\[\]/g' scripts/tome-run.sh scripts/tome-sync.sh
-          # sed -i "s|/var/www/scripts/tome-run.sh \$URI \$@||" .docker/src-cms/etc/periodic/1min/generate-static-site
+          sed -i "s|/var/www/scripts/tome-run.sh \$URI \$@||" .docker/src-cms/etc/periodic/1min/generate-static-site
           sed -i 's/80/8080/g' .docker/src-cms/etc/nginx/partials/cms.conf.tmpl
           sed -i '/listen 8080 default_server;/a\    port_in_redirect off;' .docker/src-cms/etc/nginx/partials/cms.conf.tmpl
           sed -i "s/\$service\['name'\] === 'database'/stristr(\$service\['name'\], 'mysql')/"  web/sites/default/settings.php

scripts/application/bf-tome-run.sh

@@ -4,22 +4,14 @@ SCRIPT_PATH=$(dirname "$0")
 SCRIPT_NAME=$(basename "$0")
 SCRIPT_PID=$$
 
-# URI=${1:-https://bf-static-main.bxdev.net}
-URI=https://bf-static-main.bxdev.net
-# URI=https://bf-static-dev.bxdev.net
+URI=${1:-https://bf-static-main.bxdev.net}
 FORCE=${2:-0}
 RETRY_SEMAPHORE_FILE=/tmp/tome-log/retry-on-next-run
 
 YMD=$(date +"%Y/%m/%d")
 YMDHMS=$(date +"%Y_%m_%d_%H_%M_%S")
 TR_START_TIME=$(date -u +"%s")
 
-
-# export BUCKET_NAME=$(echo "$VCAP_SERVICES" | jq -r '.s3[0].credentials.bucket')
-# export AWS_DEFAULT_REGION=$(echo "$VCAP_SERVICES" | jq -r '.s3[0].credentials.region')
-# export AWS_ACCESS_KEY_ID=$(echo "$VCAP_SERVICES" | jq -r '.s3[0].credentials.access_key_id')
-# export AWS_ENDPOINT=$(echo "$VCAP_SERVICES" | jq -r '.s3[0].credentials.endpoint')
-
 export BUCKET_NAME=$(echo "$VCAP_SERVICES" | jq -r '.s3[] | select(.name | strings | test("static")).credentials.bucket')
 export AWS_DEFAULT_REGION=$(echo "$VCAP_SERVICES" | jq -r '.s3[] | select(.name | strings | test("static")).credentials.region')
 export AWS_ACCESS_KEY_ID=$(echo "${VCAP_SERVICES}" | jq -r '.s3[] | select(.name | strings | test("static")).credentials.access_key_id')

scripts/application/bf-tome-static.sh

@@ -1,9 +1,7 @@
 #!/bin/sh
 set -x
 
-# URI=https://bf-static-dev.bxdev.net
 URI=${1:-https://bf-static-main.bxdev.net}
-URI=https://bf-static-main.bxdev.net
 
 TOME_PROCESS_COUNT=${TOME_PROCESS_COUNT:-1}