aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/misc/varnish.vcl4
-rwxr-xr-xtemplating/templating.py2
-rw-r--r--web/templates/switch.txt (renamed from templating/templates/switch.txt)0
-rw-r--r--web/templates/switches.txt (renamed from templating/templates/switches.txt)0
4 files changed, 3 insertions, 3 deletions
diff --git a/extras/misc/varnish.vcl b/extras/misc/varnish.vcl
index c9e23c5..02562ec 100644
--- a/extras/misc/varnish.vcl
+++ b/extras/misc/varnish.vcl
@@ -40,8 +40,8 @@ sub vcl_recv {
if (req.url ~ "/render") {
set req.backend_hint = graphite;
}
- if (req.url ~ "/templating") {
- set req.url = regsub(req.url, "/templating", "");
+ if (req.url ~ "/api/templates") {
+ set req.url = regsub(req.url, "/api/templates", "");
set req.backend_hint = templating;
}
diff --git a/templating/templating.py b/templating/templating.py
index 57d81b1..7b91806 100755
--- a/templating/templating.py
+++ b/templating/templating.py
@@ -17,7 +17,7 @@ def updateData():
for a in endpoints:
objects[a] = getEndpoint(a)
-env = Environment(loader=FileSystemLoader(['templates/','/opt/gondul/templating/templates']),lstrip_blocks=True, trim_blocks=True)
+env = Environment(loader=FileSystemLoader(['templates/','/opt/gondul/web/templates']),lstrip_blocks=True, trim_blocks=True)
import http.server
class MyHandler(http.server.BaseHTTPRequestHandler):
diff --git a/templating/templates/switch.txt b/web/templates/switch.txt
index 0fd9754..0fd9754 100644
--- a/templating/templates/switch.txt
+++ b/web/templates/switch.txt
diff --git a/templating/templates/switches.txt b/web/templates/switches.txt
index 0cc203b..0cc203b 100644
--- a/templating/templates/switches.txt
+++ b/web/templates/switches.txt