From 87164f2e59a9018f601ef4c375f3c2e241c45d51 Mon Sep 17 00:00:00 2001
From: tim b <timb@camcompu.home>
Date: Sat, 3 Jul 2010 15:57:23 -0700
Subject: testing how to get ip from request obj

---
 src/config.clj | 7 ++++++-
 src/site.clj   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/config.clj b/src/config.clj
index b3acb10..7019096 100644
--- a/src/config.clj
+++ b/src/config.clj
@@ -3,13 +3,18 @@
 
 ;; Configuration
 
-(def *cookie-domain* ".dump.fm")
+(def *cookie-domain* "")
 
 (def *server-url*
   (if (= (System/getProperty "user.name") "dumpfmprod")
     "http://dump.fm"
     "http://localhost:8080"))
 
+(def *deployed*
+  (if (= (System/getProperty "user.name") "dumpfmprod")
+    :prod
+    :local))
+
 (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/site.clj b/src/site.clj
index 1405ff8..2ce42ea 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1103,7 +1103,8 @@ order by count desc limit ? offset ?")
     (.toString st)))
 
 (defn show-ip [request]
-  (str request (:headers request))
+  (let [ip (:x-real-ip (:headers request))
+        ip (if ip ip (:remote-addr request))] (str ip))
 )
 
 ;; Compojure Routes
-- 
cgit v1.2.3-70-g09d2