Merge branch 'dj18' into postdj18

deploy/dump_db_prod.sh

@@ -1,2 +1,21 @@
-#!/bin/sh
+#!/bin/bash
-mysqldump -h production.cboagmr25pjs.us-east-1.rds.amazonaws.com -u root --password=unglue1t --ignore-table=unglueit.core_key unglueit
+PASSWORD=unglue1t
+HOST=production.cboagmr25pjs.us-east-1.rds.amazonaws.com
+USER=root
+DATABASE=unglueit
+DB_FILE=unglue.it.sql
+EXCLUDED_TABLES=(
+  core_key
+)
+
+IGNORED_TABLES_STRING=''
+for TABLE in "${EXCLUDED_TABLES[@]}"
+do :
+   IGNORED_TABLES_STRING+=" --ignore-table=${DATABASE}.${TABLE}"
+done
+
+echo "Dump structure"
+mysqldump --host=${HOST} --user=${USER} --password=${PASSWORD} --single-transaction --no-data ${DATABASE} > ${DB_FILE}
+
+echo "Dump content"
+mysqldump --host=${HOST} --user=${USER} --password=${PASSWORD}  --no-create-info ${DATABASE} ${IGNORED_TABLES_STRING} >> ${DB_FILE}

fabfile.py

@@ -37,7 +37,7 @@ def get_dump():
     """Dump the current db on remote server and scp it over to local machine.
     Note:  web1 has been hardcoded here to represent the name of the unglue.it server
     """
-    run("./dump.sh > unglue.it.sql ")
+    run("./dump.sh")
     run("gzip -f unglue.it.sql")
     local("scp web1:/home/ubuntu/unglue.it.sql.gz .")
     local("gunzip -f unglue.it.sql.gz")

frontend/templates/503.html

@@ -2,7 +2,7 @@
 
 {% block news %}
 <div class="launch_top">
-    We estimate that we will be back online at 2:00 pm EDT on Saturday, March 30, 2013.
+    We estimate that we will be back online at 7:00 pm PDT on Saturday, Sept 3, 2016.
 </div>
 {% endblock %}
 

settings/just.py

@@ -19,7 +19,7 @@ DATABASES = {
         'NAME': 'unglueit',
         'USER': 'root',
         'PASSWORD': 'forgetn0t',
-        'HOST': 'justdb.cboagmr25pjs.us-east-1.rds.amazonaws.com',
+        'HOST': 'justdb1.cboagmr25pjs.us-east-1.rds.amazonaws.com',
         'PORT': '',
         'TEST_CHARSET': 'utf8'
     }