diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2011-02-14 01:29:34 -0500 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2011-02-14 01:29:34 -0500 |
| commit | c07c3220ee956e02de5ea54683780e765fdb3b6c (patch) | |
| tree | 420ee5e617ef4a743c9a416143d1eb35e08fe778 | |
| parent | 447e88055cdffbd961035fa6ec46ecb740f68078 (diff) | |
| parent | 57ca0fee76ec25299d801c7a51cd1287dda8e391 (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
| -rw-r--r-- | conf/postgresql.conf | 2 | ||||
| -rw-r--r-- | src/config.clj | 7 | ||||
| -rwxr-xr-x | src/utils.clj | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/conf/postgresql.conf b/conf/postgresql.conf index d89fca0..1eec81d 100644 --- a/conf/postgresql.conf +++ b/conf/postgresql.conf @@ -56,7 +56,7 @@ external_pid_file = '/var/run/postgresql/8.4-main.pid' # write an extra PID fil # - Connection Settings - -#listen_addresses = 'localhost' # what IP address(es) to listen on; +listen_addresses = 'localhost,192.168.162.138' # what IP address(es) to listen on; # comma-separated list of addresses; # defaults to 'localhost', '*' = all # (change requires restart) diff --git a/src/config.clj b/src/config.clj index c4e2fe3..1cf5ae6 100644 --- a/src/config.clj +++ b/src/config.clj @@ -15,6 +15,11 @@ ".dump.fm" "")) +(def db-server + (if (= *server-user* "dumpfmprod") + "192.168.162.138" + "localhost")) + (def redis-server (if (= *server-user* "dumpfmprod") {:host "192.168.156.111" :port 6379 :db 0 } @@ -32,4 +37,4 @@ (def *vip-dumps-per-page* 200) (def message-count-limit 200) (def num-hall-dumps 50) -(def max-content-size 2468)
\ No newline at end of file +(def max-content-size 2468) diff --git a/src/utils.clj b/src/utils.clj index 84f185a..eb89cf1 100755 --- a/src/utils.clj +++ b/src/utils.clj @@ -23,12 +23,11 @@ compojure config)) -(let [db-host "localhost" - db-name "dumpfm" +(let [db-name "dumpfm" db-user "postgres" db-pass "root"] (def *db* {:datasource (doto (new PGPoolingDataSource) - (.setServerName db-host) + (.setServerName db-server) (.setDatabaseName db-name) (.setUser db-user) (.setPassword db-pass) |