Merge pull request #115 from ekimekim/mike/config-fixes

A grab-bag of fixes that came out of the recent test on toodles

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,

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 <<EOF
@@ -33,6 +33,7 @@ http {
 		listen 80;
 		gzip on;
 		gzip_comp_level 9;
+		absolute_redirect off;
 $LOCATIONS
 	}
 }