diff options
| author | Teddy Wing | 2018-11-23 01:02:39 +0100 |
|---|---|---|
| committer | Teddy Wing | 2018-11-23 01:02:39 +0100 |
| commit | d9add7fd9b7e81275157b8e9e6e10df26971fd39 (patch) | |
| tree | 8aeb6aa19d68391d239ae6d8b70459f951efed7a | |
| parent | 2412b421df01b5d84199ecfc44679d8493b7b87e (diff) | |
| download | dome-key-web-d9add7fd9b7e81275157b8e9e6e10df26971fd39.tar.bz2 | |
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
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | license-generator/Makefile | 4 | ||||
| -rw-r--r-- | lighttpd.conf | 14 |
3 files changed, 13 insertions, 11 deletions
@@ -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 )) ) |