whateverHEADmaster

Merge branch 'master' of http://git.ghghgh.us/dumpfm_mirror

18 files changed, 15 insertions, 5 deletions

diff --git a/src/admin.clj b/src/admin.clj
index 1073095..1073095 100644..100755
--- a/src/admin.clj
+++ b/src/admin.clj
diff --git a/src/cache_dot_clj/cache.clj b/src/cache_dot_clj/cache.clj
index 7dcfbfe..7dcfbfe 100644..100755
--- a/src/cache_dot_clj/cache.clj
+++ b/src/cache_dot_clj/cache.clj
diff --git a/src/config.clj b/src/config.clj
index b6abfb5..1481855 100644..100755
--- a/src/config.clj
+++ b/src/config.clj
@@ -7,12 +7,15 @@
 
 (def *server-url*
   (if (= *server-user* "dumpfmprod")
-    "http://dump.fm"
-    "http://localhost:8080"))
+    ;"http://dump.fm"
+    "http://asdf.us:8080"))
 
 (def *cookie-domain*  
   (if (= *server-user* "dumpfmprod")
-    ".dump.fm"
+    ;".dump.fm" ; is this ok or should I comment this too? this too
+    ; not clojure specialist, but all this stuff doesn't look good, app should be able to run from any location and still work as usual, domains shouldn't
+    ; be hardcoded at all. in html paths can be relative, which removes need to figure out which domain you running app on. I hear you, 
+    ; let's just get it working though, right? sure
     ""))
 
 (def db-server
@@ -22,7 +25,8 @@
 
 (def redis-server
   (if (= *server-user* "dumpfmprod")
-    {:host "192.168.156.111" :port 6379 :db 0 }
+    ;{:host "192.168.156.111" :port 6379 :db 0 } ;these ip addresses need to change right? yes should I try deleting this? or statically
+    ;setting it to my public ip? why public ip, it should be just 127.0.0.1 or something like redis.dump.fm if you plan to have more than one server.
     {:host "127.0.0.1" :port 6379 :db 0 }))
 
 (def *root-directory* (System/getProperty "user.dir"))
diff --git a/src/datalayer.clj b/src/datalayer.clj
index 52d3b0a..52d3b0a 100644..100755
--- a/src/datalayer.clj
+++ b/src/datalayer.clj
diff --git a/src/db_populate.clj b/src/db_populate.clj
index 5d47d13..5d47d13 100644..100755
--- a/src/db_populate.clj
+++ b/src/db_populate.clj
diff --git a/src/email.clj b/src/email.clj
index 8a29418..8a29418 100644..100755
--- a/src/email.clj
+++ b/src/email.clj
diff --git a/src/events.clj b/src/events.clj
index 501c231..501c231 100644..100755
--- a/src/events.clj
+++ b/src/events.clj
diff --git a/src/fame.clj b/src/fame.clj
index 1baf6e0..1baf6e0 100644..100755
--- a/src/fame.clj
+++ b/src/fame.clj
diff --git a/src/imgreplacer.clj b/src/imgreplacer.clj
index 03ae0e6..03ae0e6 100644..100755
--- a/src/imgreplacer.clj
+++ b/src/imgreplacer.clj
diff --git a/src/jedis.clj b/src/jedis.clj
index bc53eda..bc53eda 100644..100755
--- a/src/jedis.clj
+++ b/src/jedis.clj
diff --git a/src/message.clj b/src/message.clj
index 5b3b66f..5b3b66f 100644..100755
--- a/src/message.clj
+++ b/src/message.clj
diff --git a/src/multikey_cache.clj b/src/multikey_cache.clj
index ac462ca..ac462ca 100644..100755
--- a/src/multikey_cache.clj
+++ b/src/multikey_cache.clj
diff --git a/src/redisload.clj b/src/redisload.clj
index abb0252..abb0252 100644..100755
--- a/src/redisload.clj
+++ b/src/redisload.clj
diff --git a/src/rooms.clj b/src/rooms.clj
index 3367ea9..3367ea9 100644..100755
--- a/src/rooms.clj
+++ b/src/rooms.clj
diff --git a/src/scheduled_agent.clj b/src/scheduled_agent.clj
index d2e1454..d2e1454 100644..100755
--- a/src/scheduled_agent.clj
+++ b/src/scheduled_agent.clj
diff --git a/src/site.clj b/src/site.clj
index afde8c5..06d711b 100644..100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -144,6 +144,12 @@
    (Apply to request map)"
   [{session :session}]
   (contains? session :nick))
+; it's OK
+; I registered "hump.fm" and was going to host it there
+; I can just sed replace all these references, right? yeah that will work ok cool I'll set it up 
+; anything else I need to do? well clean up all those domain references would be nice, not critical, but still. awesome
+; so now the redirect after login will work (if I change it to hump.fm?)? yep ok awesome
+; I'll message you later today, if that's ok sure thanks again
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Login-token version history
@@ -1061,7 +1067,7 @@ WHERE  user_id IN
       (let [info (fetch-nick nick)]
         (update-nick-hash nick hash)
         [(session-assoc-from-db info)
-         (redirect-to "http://dump.fm/")])
+         (redirect-to "/")])
       [200 "BAD_REQUEST"])))
 
 ;; Upload
diff --git a/src/tags.clj b/src/tags.clj
index e325a0d..e325a0d 100644..100755
--- a/src/tags.clj
+++ b/src/tags.clj
diff --git a/src/user.clj b/src/user.clj
index 25e1824..25e1824 100644..100755
--- a/src/user.clj
+++ b/src/user.clj