From 86f22d38d804b74dd3225b838b20635b6e0a0e6a Mon Sep 17 00:00:00 2001
From: ekimekim <ekimekim@vst>
Date: Sat, 26 Oct 2019 02:48:02 -0500
Subject: [PATCH 1/3] docker-compose: Need to tell sheet-sync to allocate ids

NOTE: This is only safe if we're only running one.

Later we should make a way to control this in config so one node has it
but others can run non-allocating sheetsyncs.
---
 docker-compose.jsonnet | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.jsonnet b/docker-compose.jsonnet
index 0d7fc06..257aa23 100644
--- a/docker-compose.jsonnet
+++ b/docker-compose.jsonnet
@@ -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,

From 742fcc3a28a7ac4152466d4e3c2b9179adb56c07 Mon Sep 17 00:00:00 2001
From: ekimekim <ekimekim@vst>
Date: Sat, 26 Oct 2019 02:54:24 -0500
Subject: [PATCH 2/3] Update default worksheet list to correct typo

---
 docker-compose.jsonnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.jsonnet b/docker-compose.jsonnet
index 257aa23..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
 

From 6ef27fe75763b6d499605a15c689e6d7b1e2b2c6 Mon Sep 17 00:00:00 2001
From: ekimekim <ekimekim@vst>
Date: Sat, 26 Oct 2019 03:07:28 -0500
Subject: [PATCH 3/3] nginx: Always use relative paths

So that using non-standard ports, etc. doesn't break things
---
 nginx/generate-config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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