diff options
| -rw-r--r-- | db/0-create.psql | 2 | ||||
| -rw-r--r-- | src/config.clj | 13 | ||||
| -rw-r--r-- | src/site.clj | 12 |
3 files changed, 15 insertions, 12 deletions
diff --git a/db/0-create.psql b/db/0-create.psql index 5016aa2..39e2bf3 100644 --- a/db/0-create.psql +++ b/db/0-create.psql @@ -118,6 +118,7 @@ CREATE TABLE invalid_feed_images ( CREATE INDEX invalid_feed_images_idx ON invalid_feed_images (image_url); +-- dont add this yet CREATE TABLE avatars ( avatar_id SERIAL PRIMARY KEY, user_id NOT NULL REFERENCES users, @@ -131,6 +132,7 @@ CREATE TABLE avatars ( th integer ); +-- dont add this yet CREATE TABLE images ( image_id SERIAL PRIMARY KEY, 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")))) |