diff --git a/docker-compose.jsonnet b/docker-compose.jsonnet index 0d7fc06..7638241 100644 --- a/docker-compose.jsonnet +++ b/docker-compose.jsonnet @@ -118,7 +118,7 @@ // The spreadsheet id and worksheet names for sheet sync to act on sheet_id:: "your_id_here", - worksheets:: ["Tech Test & Preshow"] + ["Day %d" % n for n in std.range(1, 7)], + worksheets:: ["Tech Test & Pre-Show"] + ["Day %d" % n for n in std.range(1, 7)], // Now for the actual docker-compose config @@ -237,6 +237,7 @@ // Args for the sheetsync command: [ "--backdoor-port", std.toString($.backdoor_port), + "--allocate-ids", $.db_connect, "/etc/wubloader-creds.json", $.edit_url, diff --git a/nginx/generate-config b/nginx/generate-config index 4300ea1..17f846d 100755 --- a/nginx/generate-config +++ b/nginx/generate-config @@ -17,7 +17,7 @@ LOCATIONS=$( # all services have metrics under /metrics/SERVICE, except for thrimebletrimmer generate_location "/metrics/$name" "http://$name:$port/metrics" done - [ -n "$THRIMBLETRIMMER" ] && echo -e "\t\tlocation = / { return 301 \$scheme://\$host/thrimbletrimmer/dashboard.html; }\n\t\tlocation /thrimbletrimmer { }" + [ -n "$THRIMBLETRIMMER" ] && echo -e "\t\tlocation = / { return 301 /thrimbletrimmer/dashboard.html; }\n\t\tlocation /thrimbletrimmer { }" ) cat > /etc/nginx/nginx.conf <