update doorlock daemon to first release version

oursky · Aug 15, 2016 · 616240c · 616240c
2 parents 0d41e91 + 5a66789
commit 616240c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -26,26 +26,26 @@ Diagrams are saved as `txt` files, you can import them under `File > Import From
 
 **Dependencies:**
 
-* clojure
 * leiningen
 
 **Build:**
 ```
 [~/]$ git clone ...
 [~/doorlock/embedded]$ lein uberjar
 ```
-The standalone JAR is now in `doorlock/embedded/target/doorlock-<version>-standalone.jar`.
+The compiled JAR is now in `doorlock/embedded/target/doorlock-<version>-standalone.jar`.
 
 ### Deploy
 **Embedded OS:** ArchLinux ARM
 
 **Dependencies:**
+
 * java
 * wiringpi-git (AUR)
 
 **Install as systemd service:**
 
-1. copy the standalone JAR to `/home/oursky/`
+1. copy the compiled JAR to `/home/oursky/doorlock.jar`
 2. copy `doorlock.service` to `/etc/systemd/system/`
 3. enable and start the service:
 ```

diff --git a/embedded/.npmrc b/embedded/.npmrc
diff --git a/embedded/doorlock.service b/embedded/doorlock.service
@@ -3,7 +3,7 @@ Description=Doorlock Controller Daemon
 
 [Service]
 User=oursky
-ExecStart=/usr/bin/java -jar /home/oursky/doorlock-1.0.0-SNAPSHOT-standalone.jar
+ExecStart=/usr/bin/java -jar /home/oursky/doorlock.jar
 
 [Install]
 WantedBy=multi-user.target
diff --git a/embedded/project.clj b/embedded/project.clj
@@ -1,4 +1,4 @@
-(defproject com.oursky/doorlock "1.0.0-SNAPSHOT"
+(defproject com.oursky/doorlock "1.0.0"
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/core.async "0.2.385"]

diff --git a/embedded/src/com/oursky/doorlock/core.clj b/embedded/src/com/oursky/doorlock/core.clj
@@ -10,10 +10,6 @@
 ; identify the trigger source by sending {:source <source>}
 (def unlock-chan (chan))
 
-(defn http-handler [req]
-  (>!! unlock-chan {:source :network})
-  {:status 200})
-
 (defn -main [& args]
   ; setup GPIO via wiringpi CLI interface
   ; the clj-gpio library does not support internal pull-up
@@ -45,6 +41,10 @@
              (log/info "Door Locked"))
            (recur (<! unlock-chan)))
 
-  (run-server http-handler {:ip "0.0.0.0" :port 8090})
+  (run-server (fn [req]
+                (>!! unlock-chan {:source (or (get-in req [:headers "x-source"])
+                                              :network)})
+                {:status 200})
+              {:ip "0.0.0.0" :port 8090})
 
   (log/info "=== Daemon Started ==="))