add config clojure file

3 files changed, 22 insertions, 16 deletions

diff --git a/src/config.clj b/src/config.clj
new file mode 100644
index 0000000..b3acb10
--- /dev/null
+++ b/src/config.clj
@@ -0,0 +1,15 @@
+(ns config
+  (:import java.lang.System))
+
+;; Configuration
+
+(def *cookie-domain* ".dump.fm")
+
+(def *server-url*
+  (if (= (System/getProperty "user.name") "dumpfmprod")
+    "http://dump.fm"
+    "http://localhost:8080"))
+
+(def *root-directory* (System/getProperty "user.dir"))
+(def *image-directory* "images")
+(def *avatar-directory* "avatars")
\ No newline at end of file
diff --git a/src/cookie_login.clj b/src/cookie_login.clj
index 7eee2ae..5bf9811 100755
--- a/src/cookie_login.clj
+++ b/src/cookie_login.clj
@@ -1,5 +1,6 @@
 (ns cookie-login
-  (:use compojure))
+  (:use compojure
+        config))
 
 (def *login-token-key* :login-token)
 (def *login-token-expiry* (* 1000 60 60 24 7)) ; one week
@@ -9,7 +10,7 @@
   [token-key]
   (set-cookie token-key "dummy"
               :expires "Thu, 01-Jan-1970 00:00:01 GMT"
-              :domain ".dump.fm"))
+              :domain *cookie-domain*))
 
 (defn handle-request-with-login-token
   "Validates login token, handles request, and updates cookies and session
diff --git a/src/site.clj b/src/site.clj
index 6c6a9dd..934e02d 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -12,6 +12,7 @@
         clojure.contrib.sql
         clojure.contrib.str-utils
         clojure.contrib.def
+        config
         admin
         compojure
         email
@@ -24,17 +25,6 @@
         scheduled-agent
         user))
 
-;; Configuration
-
-(def *server-url*
-  (if (= (System/getProperty "user.name") "dumpfmprod")
-    "http://dump.fm"
-    "http://localhost:8080"))
-
-(def *root-directory* (System/getProperty "user.dir"))
-(def *image-directory* "images")
-(def *avatar-directory* "avatars")
-
 ; Create image directories if they don't exist.
 (.mkdir (new File *image-directory*))
 (.mkdir (new File *avatar-directory*))
@@ -233,7 +223,7 @@
         token      (encode-login-token nick hash expiration)]
     (set-cookie *login-token-key* token
                 :expires (gmt-string (new Date expiration))
-                :domain ".dump.fm")))
+                :domain *cookie-domain*)))
 
 ;; Landing
 
@@ -260,7 +250,7 @@
   [(session-dissoc :nick :user_id :is_admin :avatar)
    (set-cookie *login-token-key* "dummy"
                :expires "Thu, 01-Jan-1970 00:00:01 GMT"
-               :domain ".dump.fm")
+               :domain *cookie-domain*)
    (redirect-to "http://dump.fm/")])
 
 ;; Registration
@@ -1039,7 +1029,7 @@ FROM   users u
 
 (def *session-cookie-params* {:type :memory
                               :expires (* 60 60)
-                              :domain ".dump.fm"})
+                              :domain *cookie-domain*})
 
 (decorate pichat
   (with-mimetypes {:mimetypes mimetypes})