Makefile.in

@@ -17,8 +17,8 @@ front:
 
 @nginx_dir@sites_available/@nginx_config@: nginx/yacswa.conf
 	@echo "Installing nginx config..."
-	@sudo mkdir -p @nginx_dir@sites_available
-	@sudo cp nginx/yacswa.conf @nginx_dir@sites_available/@nginx_config@
+	@mkdir -p @nginx_dir@sites_available
+	@cp nginx/yacswa.conf @nginx_dir@sites_available/@nginx_config@
 
 install: @public_dir@ @nginx_dir@sites_available/@nginx_config@
 

backend/Makefile.in

@@ -14,7 +14,8 @@ csv:
 up: .backend.lock
 
 .backend.lock: main.scm
-	@GUILE_AUTO_COMPILE=0 @GUILE@ ./main.scm > yacswa-backend.log & PID=$$!; echo $${PID} > .backend.lock && echo "Server spawned with PID $${PID}"
+	@@GUILE@ ./main.scm > yacswa-backend.log & export PID=$$!; echo $${PID} > .backend.lock
+	@echo "Server spawned with PID $${PID}" && echo $${PID} > .backend.lock && unset PID
 
 down:
-	@PID=`cat .backend.lock` && kill -15 $${PID} && rm .backend.lock && echo "Server on PID $${PID} down."; unset PID
+	@export PID=`cat .backend.lock` && kill -15 $${PID} && rm .backend.lock && echo "Server on PID $${PID} down."; unset PID

backend/src/scheduler.scm

@@ -90,8 +90,7 @@
                      (province . ,(assq-ref plist 'province))
                      (prov-terse . ,(assq-ref plist 'prov-code))
                      (last-7 . ,(sum-first-n 7 (assq-ref plist 'reports)))
-                     (last-14 . ,(sum-first-n 14 (assq-ref plist 'reports)))
-                     (expiry . ,($expiry-timestamp))))))
+                     (last-14 . ,(sum-first-n 14 (assq-ref plist 'reports)))))))
        (set-symbol-property! hr-sym 'json-string json)))
    hr-syms))
 

frontend/Makefile.in

@@ -3,7 +3,7 @@
 
 all: www/elm.js
 
-www/elm.js: src/*.elm
+www/elm.js:
 	@ELM@ make src/Main.elm --output=www/elm.js
 
 install: www/elm.js @public_dir@

nginx/yacswa.conf.in

@@ -5,27 +5,23 @@ server {
 
     server_name @server_name@ www.@server_name@;
 
-    root @public_dir@/www;
-    try_files $uri /not_found;
-
-    location / {
-        index index.html;
-    }
+    root @public_dir@;
+    try_files $uri $uri/ /not_found;
 
     location /json/pc {
-        proxy_pass http://127.0.0.1:1665/json/pc;
+        proxy_pass 127.0.0.1:1665/json/pc
     }
 
     location /json/hr {
-        proxy_pass http://127.0.0.1:1665/json/hr;
+        proxy_pass 127.0.0.1:1665/json/hr
     }
 
     location /json/batch {
-        proxy_pass http://127.0.0.1:1665/json/batch;
+        proxy_pass 127.0.0.1:1665/json/batch
     }
 
     location /update {
-        proxy_pass http://127.0.0.1:1665/update;
+        proxy_pass 127.0.0.1:1665/update
     }
 
     location /not_found {