# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2019-06-01 10:54:45
# Node ID ec6ec713c27613ba30ec48f3bb406ddd0302eb8e
# Parent  d4038ddf6cc98f3648e6badd62e5faba3232a6d6

output escaping bug in homepage made spectrograms fail
Ignore-this: b27ede936127b02f4ed30e132d2bf0d

diff --git a/bin/homepageConfig b/bin/homepageConfig
--- a/bin/homepageConfig
+++ b/bin/homepageConfig
@@ -16,8 +16,8 @@ print("listen %s;" % splitport(urlparse(
 
 
 def location(path, server):
-    print("""
-    location /%(path)s/ {
+    print(f"""
+    location /{path}/ {{
 
       # for websocket
       proxy_http_version 1.1;
@@ -25,10 +25,10 @@ def location(path, server):
       proxy_set_header Connection "upgrade";
       proxy_set_header Host $host;
 
-      proxy_pass %(server)s;
+      proxy_pass {server};
       proxy_buffering off;
       rewrite /[^/]+/(.*) /$1 break;
-    }""" % vars())
+    }}""")
 
 
 for role, server in sorted(graph.predicate_objects(netHome)):
@@ -41,10 +41,8 @@ for role, server in sorted(graph.predica
     location(path, server)
 
 showPath = showconfig.showUri().split('/', 3)[-1]
-print("""
-    location /%(path)s {
-      root %(root)s;
-    }""" % {
-    'path': showPath,
-    'root': showconfig.root()[:-len(showPath)]
-})
+root = showconfig.root()[:-len(showPath)].decode('ascii')
+print(f"""
+    location /{showPath} {{
+      root {root};
+    }}""")