diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2010-07-04 18:19:18 -0400 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2010-07-04 18:19:18 -0400 |
| commit | ae77b19680b6b83d93d5951108029c4889c5868a (patch) | |
| tree | 20b70f21af02cb09f0d616cbc16ebe05ce35e413 /src | |
| parent | 231a9933b7766306ae109b2e511c971caadea6b2 (diff) | |
| parent | 57b4ecea5e20f4746c23911a6cc85508e0509536 (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.clj | 13 | ||||
| -rw-r--r-- | src/site.clj | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/config.clj b/src/config.clj index f09daf8..15834cb 100644 --- a/src/config.clj +++ b/src/config.clj @@ -3,17 +3,18 @@ ;; Configuration -(def *cookie-domain* ".dump.fm") +(def *server-user* (System/getProperty "user.name")) +;; (if (= (System/getProperty "user.name") "dumpfmprod") (def *server-url* - (if (= (System/getProperty "user.name") "dumpfmprod") + (if (= *server-user* "dumpfmprod") "http://dump.fm" "http://localhost:8080")) -(def *deployed* - (if (= (System/getProperty "user.name") "dumpfmprod") - :prod - :local)) +(def *cookie-domain* + (if (= *server-user* "timb") + "" + ".dump.fm")) (def *root-directory* (System/getProperty "user.dir")) (def *image-directory* "images") diff --git a/src/site.clj b/src/site.clj index 6af0ebd..04ebecb 100644 --- a/src/site.clj +++ b/src/site.clj @@ -267,12 +267,12 @@ (make-login-token db-user) (clear-login-token *login-token-key*)) ip (get-ip request)] - (if db-user - (do - (log-login (db-user :user_id) ip) - [(session-assoc-from-db db-user) - login-cookie - (resp-success "OK")] + (if db-user + (do + (log-login (db-user :user_id) ip) + [(session-assoc-from-db db-user) + login-cookie + (resp-success "OK")] ) (resp-error "BAD_LOGIN")))) |