From 249c70f9c44a81d5df54ff6e937599c27129930e Mon Sep 17 00:00:00 2001 From: Pepper Date: Fri, 27 Jan 2017 16:04:06 -0500 Subject: ok moving --- src/admin.clj | 0 src/cache_dot_clj/cache.clj | 0 src/config.clj | 12 ++++++++---- src/datalayer.clj | 0 src/db_populate.clj | 0 src/email.clj | 0 src/events.clj | 0 src/fame.clj | 0 src/imgreplacer.clj | 0 src/jedis.clj | 0 src/message.clj | 0 src/multikey_cache.clj | 0 src/redisload.clj | 0 src/rooms.clj | 0 src/scheduled_agent.clj | 0 src/site.clj | 8 +++++++- src/tags.clj | 0 src/user.clj | 0 18 files changed, 15 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/admin.clj mode change 100644 => 100755 src/cache_dot_clj/cache.clj mode change 100644 => 100755 src/config.clj mode change 100644 => 100755 src/datalayer.clj mode change 100644 => 100755 src/db_populate.clj mode change 100644 => 100755 src/email.clj mode change 100644 => 100755 src/events.clj mode change 100644 => 100755 src/fame.clj mode change 100644 => 100755 src/imgreplacer.clj mode change 100644 => 100755 src/jedis.clj mode change 100644 => 100755 src/message.clj mode change 100644 => 100755 src/multikey_cache.clj mode change 100644 => 100755 src/redisload.clj mode change 100644 => 100755 src/rooms.clj mode change 100644 => 100755 src/scheduled_agent.clj mode change 100644 => 100755 src/site.clj mode change 100644 => 100755 src/tags.clj mode change 100644 => 100755 src/user.clj (limited to 'src') diff --git a/src/admin.clj b/src/admin.clj old mode 100644 new mode 100755 diff --git a/src/cache_dot_clj/cache.clj b/src/cache_dot_clj/cache.clj old mode 100644 new mode 100755 diff --git a/src/config.clj b/src/config.clj old mode 100644 new mode 100755 index b6abfb5..1481855 --- 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 old mode 100644 new mode 100755 diff --git a/src/db_populate.clj b/src/db_populate.clj old mode 100644 new mode 100755 diff --git a/src/email.clj b/src/email.clj old mode 100644 new mode 100755 diff --git a/src/events.clj b/src/events.clj old mode 100644 new mode 100755 diff --git a/src/fame.clj b/src/fame.clj old mode 100644 new mode 100755 diff --git a/src/imgreplacer.clj b/src/imgreplacer.clj old mode 100644 new mode 100755 diff --git a/src/jedis.clj b/src/jedis.clj old mode 100644 new mode 100755 diff --git a/src/message.clj b/src/message.clj old mode 100644 new mode 100755 diff --git a/src/multikey_cache.clj b/src/multikey_cache.clj old mode 100644 new mode 100755 diff --git a/src/redisload.clj b/src/redisload.clj old mode 100644 new mode 100755 diff --git a/src/rooms.clj b/src/rooms.clj old mode 100644 new mode 100755 diff --git a/src/scheduled_agent.clj b/src/scheduled_agent.clj old mode 100644 new mode 100755 diff --git a/src/site.clj b/src/site.clj old mode 100644 new mode 100755 index afde8c5..06d711b --- 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 old mode 100644 new mode 100755 diff --git a/src/user.clj b/src/user.clj old mode 100644 new mode 100755 -- cgit v1.2.3-70-g09d2