Compare commits

...

2 Commits

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

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

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

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

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

Loading…
Cancel
Save