Rebrand: HUMPFM env vars + salts

8 files changed, 23 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 5cc8a66..929bf3c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@
 /avatars/
 /images/
 
-# Local SQL dumps/backups (often huge)
-/DUMPFM_BACKUP.sql
+# Local SQL backups (often huge)
+/*_BACKUP.sql
 /humpfm_backup_*.sql
 
 # Local server configs
diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index 0fd649e..5705f1c 100755
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -18,8 +18,8 @@ debug
 developers
 directory
 dis-register
-dump
-dumpfm
+hump
+humpfm
 error
 errorlogger
 event
diff --git a/photobooth/fullscreenmgmt.js b/photobooth/fullscreenmgmt.js
index 6137238..4f5ba97 100755
--- a/photobooth/fullscreenmgmt.js
+++ b/photobooth/fullscreenmgmt.js
@@ -117,7 +117,7 @@ function login() {
     var nick = $('#nickInput').val();
     var password = $('#passwordInput').val();
     var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
-    var hash = hex_sha1(nick + '$' + password + '$dumpfm');
+    var hash = hex_sha1(nick + '$' + password + '$humpfm');
 
     var onSuccess = function(json) {
 	 if (typeof pageTracker !== 'undefined') {
@@ -182,4 +182,4 @@ $(function() {
         $('#memelogo').stop(true, false).animate({opacity: 1.0}, "fast").delay(LogoFadeDelay).animate({opacity: 0}, "slow");
     });
     $('#memelogo').delay(LogoFadeDelay).animate({opacity: 0}, "slow");
-});
\ No newline at end of file
+});
diff --git a/photobooth/fullscreenphotobooth.js b/photobooth/fullscreenphotobooth.js
index 6137238..4f5ba97 100755
--- a/photobooth/fullscreenphotobooth.js
+++ b/photobooth/fullscreenphotobooth.js
@@ -117,7 +117,7 @@ function login() {
     var nick = $('#nickInput').val();
     var password = $('#passwordInput').val();
     var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
-    var hash = hex_sha1(nick + '$' + password + '$dumpfm');
+    var hash = hex_sha1(nick + '$' + password + '$humpfm');
 
     var onSuccess = function(json) {
 	 if (typeof pageTracker !== 'undefined') {
@@ -182,4 +182,4 @@ $(function() {
         $('#memelogo').stop(true, false).animate({opacity: 1.0}, "fast").delay(LogoFadeDelay).animate({opacity: 0}, "slow");
     });
     $('#memelogo').delay(LogoFadeDelay).animate({opacity: 0}, "slow");
-});
\ No newline at end of file
+});
diff --git a/scripts/fill.image_altars.py b/scripts/fill.image_altars.py
index 1181214..3d248a1 100755
--- a/scripts/fill.image_altars.py
+++ b/scripts/fill.image_altars.py
@@ -27,7 +27,7 @@ def add_altar(message_id, user_id, content):
   except postgresql.exceptions.UniqueError:
     print("skipped adding a dupe")
 
-# NOTE. hardcoded room numbers to index here... only indexing DUMPFM (1) and GIF (8) currently.
+# NOTE: hardcoded room numbers to index here... only indexing HUMPFM (1) and GIF (8) currently.
 def get_messages():
   ps = db.prepare("SELECT message_id, user_id, content FROM messages WHERE message_id >= $1 AND message_id <= $2 AND room_id IN (1,8) ORDER BY message_id ASC")
   return ps.chunks
diff --git a/scripts/fill.image_urls.py b/scripts/fill.image_urls.py
index d3a10de..a7c518b 100755
--- a/scripts/fill.image_urls.py
+++ b/scripts/fill.image_urls.py
@@ -29,7 +29,7 @@ def add_url(url):
   ps2 = db.prepare("INSERT INTO image_urls(url) VALUES($1)")
   ps2(url)
 
-# NOTE. hardcoded room numbers to index here... only indexing DUMPFM (1) and GIF (8) currently.
+# NOTE: hardcoded room numbers to index here... only indexing HUMPFM (1) and GIF (8) currently.
 def get_messages(lower, upper):
   ps = db.prepare("SELECT content FROM messages WHERE message_id >= $1 AND message_id <= $2 AND room_id IN (1,8) ORDER BY message_id ASC")
   rows = ps(lower, upper)
diff --git a/src/config.clj b/src/config.clj
index bec5768..3ee165d 100755
--- a/src/config.clj
+++ b/src/config.clj
@@ -25,45 +25,45 @@
         (contains? #{"1" "true" "yes" "on"} (.toLowerCase v))))))
 
 (def *server-url*
-  (getenv "DUMPFM_SERVER_URL"
+  (getenv "HUMPFM_SERVER_URL"
           (if (= *server-user* "humpfmprod")
             "/"
             "http://localhost:8080")))
 
 (def *public-host*
-  (getenv "DUMPFM_PUBLIC_HOST"
+  (getenv "HUMPFM_PUBLIC_HOST"
           (try
             (.getHost (URL. *server-url*))
             (catch Exception _ ""))))
 
 (def *public-scheme*
-  (getenv "DUMPFM_PUBLIC_SCHEME"
+  (getenv "HUMPFM_PUBLIC_SCHEME"
           (try
             (.getProtocol (URL. *server-url*))
             (catch Exception _ "http"))))
 
 (def *cookie-domain*  
-  (getenv "DUMPFM_COOKIE_DOMAIN"
+  (getenv "HUMPFM_COOKIE_DOMAIN"
           (if (= *server-user* "humpfmprod")
             ".hump.fm"
             "")))
 
 (def *passwordless-login*
-  (getenv-bool "DUMPFM_PASSWORDLESS_LOGIN" false))
+  (getenv-bool "HUMPFM_PASSWORDLESS_LOGIN" false))
 
 (def db-server
-  (getenv "DUMPFM_DB_HOST"
+  (getenv "HUMPFM_DB_HOST"
           (if (= *server-user* "humpfmprod")
             "localhost"; "192.168.162.138"
             "localhost")))
 
 (def redis-server
-  {:host (getenv "DUMPFM_REDIS_HOST"
+  {:host (getenv "HUMPFM_REDIS_HOST"
                  (if (= *server-user* "humpfmprod")
                    "127.0.0.1"
                    "127.0.0.1"))
-   :port (getenv-int "DUMPFM_REDIS_PORT" 6379)
-   :db   (getenv-int "DUMPFM_REDIS_DB" 0)})
+   :port (getenv-int "HUMPFM_REDIS_PORT" 6379)
+   :db   (getenv-int "HUMPFM_REDIS_DB" 0)})
 
 (def *root-directory* (System/getProperty "user.dir"))
 (def *image-directory* "images")
diff --git a/src/utils.clj b/src/utils.clj
index 0be144c..b5a4eaa 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -24,10 +24,10 @@
         config
         ))
 
-(let [db-name (or (System/getenv "DUMPFM_DB_NAME") "humpfm")
-      db-user (or (System/getenv "DUMPFM_DB_USER") "postgres")
-      db-pass (or (System/getenv "DUMPFM_DB_PASSWORD") "")
-      db-port (let [p (System/getenv "DUMPFM_DB_PORT")]
+(let [db-name (or (System/getenv "HUMPFM_DB_NAME") "humpfm")
+      db-user (or (System/getenv "HUMPFM_DB_USER") "postgres")
+      db-pass (or (System/getenv "HUMPFM_DB_PASSWORD") "")
+      db-port (let [p (System/getenv "HUMPFM_DB_PORT")]
                 (if p (Integer/parseInt p) 5432))]
   (def *db* {:datasource (doto (new PGPoolingDataSource)
                            (.setServerName   db-server)