From d9add7fd9b7e81275157b8e9e6e10df26971fd39 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Fri, 23 Nov 2018 01:02:39 +0100
Subject: lighttpd.conf: Allow running from the project root

* Move the `make run` target into the project root's Makefile
* Update paths in lighttpd.conf to correspond to its new location
---
 Makefile                   |  6 ++++++
 license-generator/Makefile |  4 ----
 lighttpd.conf              | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 license-generator/Makefile

diff --git a/Makefile b/Makefile
index 26b9d76..1a632f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,9 @@
+.PHONY: run
+run:
+	ls license-generator/target/debug/fulfillment \
+			license-generator/target/debug/license | \
+		entr -r lighttpd -f lighttpd.conf -D
+
 .PHONY: css
 css: assets/styles.css
 
diff --git a/license-generator/Makefile b/license-generator/Makefile
deleted file mode 100644
index 7f6f1c2..0000000
--- a/license-generator/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: run
-run:
-	ls target/debug/fulfillment target/debug/license | \
-		entr -r lighttpd -f lighttpd.conf -D
diff --git a/lighttpd.conf b/lighttpd.conf
index c0e0a1f..b76673a 100644
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -1,5 +1,5 @@
 var.log_root    = "/usr/local/var/log/lighttpd"
-var.server_root = ".."
+var.server_root = "."
 server.document-root = server_root
 server.port = 8080
 server.errorlog = log_root + "/error.log"
@@ -9,21 +9,21 @@ server.modules += ( "mod_fastcgi" )
 fastcgi.debug = 1
 fastcgi.server = (
     "/fulfillment" => ((
-        "socket" => "./fulfillment.fcgi.socket",
+        "socket" => "./license-generator/fulfillment.fcgi.socket",
         "check-local" => "disable",
-        "bin-path" => var.CWD + "/target/debug/fulfillment",
+        "bin-path" => var.CWD + "/license-generator/target/debug/fulfillment",
         "max-procs" => 1
     )),
     "/license" => ((
-        "socket" => "./license.fcgi.socket",
+        "socket" => "./license-generator/license.fcgi.socket",
         "check-local" => "disable",
-        "bin-path" => var.CWD + "/target/debug/license",
+        "bin-path" => var.CWD + "/license-generator/target/debug/license",
         "max-procs" => 1
     )),
     "/license/download" => ((
-        "socket" => "./license-download.fcgi.socket",
+        "socket" => "./license-generator/license-download.fcgi.socket",
         "check-local" => "disable",
-        "bin-path" => var.CWD + "/target/debug/license",
+        "bin-path" => var.CWD + "/license-generator/target/debug/license",
         "max-procs" => 1
     ))
 )
-- 
cgit v1.2.3