Standardize database variables

We create the evergreen database user as a superuser, so we can use it
accordingly.

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/installer/jessie/eg_jessie_installer.sh b/installer/jessie/eg_jessie_installer.sh
index 0c175b4..c7806cf 100755 (executable)
--- a/installer/jessie/eg_jessie_installer.sh
+++ b/installer/jessie/eg_jessie_installer.sh
@@ -80,6 +80,13 @@ function init_variables {
     export ADMIN_USER='admin';
     export ADMIN_PASS='demo123';
     # -----------------------------------------------------------------------
+    # Database variables
+    # -----------------------------------------------------------------------
+    export PGDATABASE=evergreen
+    export PGUSER=evergreen
+    export PGPASSWORD=evergreen
+    export PGHOST=localhost
+    # -----------------------------------------------------------------------
     # You can override these like so:
     #       EVERGREEN_BRANCH='master' ./eg_jessie_installer.sh
     # -----------------------------------------------------------------------
@@ -418,11 +425,11 @@ function configure_database {
     echo _.-~= configure database
     date
     if [ $YES ]; then
-        echo "Using password evergreen for the evergreen database user."
-        echo -e "evergreen\nevergreen\n" | su - postgres sh -c 'createuser -P -s evergreen;'
+        echo "Using password $PGPASSWORD for the $PGUSER database user."
+        echo -e "$PGPASSWORD\n$PGPASSWORD\n" | su - postgres sh -c "createuser -P -s $PGUSER;"
     else
-        echo -e "\n\nPlease enter a password for the evergreen database user.\n  If you do not want to edit configs, use \"evergreen\"\n"
-        su - postgres sh -c 'createuser -P -s evergreen;'
+        echo -e "\n\nPlease enter a password for the $PGUSER database user.\n  If you do not want to edit configs, use \"$PGPASSWORD\"\n"
+        su - postgres sh -c "createuser -P -s $PGUSER;"
     fi;
 
     # Apply the DB schema
@@ -433,10 +440,10 @@ function configure_database {
         --create-offline        \
         --update-config $SAMPLEDATA \
         --service all           \
-        --user evergreen        \
-        --password evergreen    \
-        --hostname localhost    \
-        --database evergreen    \
+        --user $PGUSER          \
+        --password $PGPASSWORD  \
+        --hostname $PGHOST      \
+        --database $PGDATABASE  \
         --admin-user $ADMIN_USER \
         --admin-pass $ADMIN_PASS;
     echo Return Value = $?

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index cf41962..837c4c2 100755 (executable)
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -81,6 +81,13 @@ function init_variables {
     export ADMIN_USER='admin';
     export ADMIN_PASS='demo123';
     # -----------------------------------------------------------------------
+    # Database variables
+    # -----------------------------------------------------------------------
+    export PGDATABASE=evergreen
+    export PGUSER=evergreen
+    export PGPASSWORD=evergreen
+    export PGHOST=localhost
+    # -----------------------------------------------------------------------
     # You can override these like so:
     #       EVERGREEN_BRANCH='master' ./eg_wheezy_installer.sh
     # -----------------------------------------------------------------------
@@ -426,11 +433,11 @@ function configure_database {
     echo _.-~= configure database
     date
     if [ $YES ]; then
-        echo "Using password evergreen for the evergreen database user."
-        echo -e "evergreen\nevergreen\n" | su - postgres sh -c 'createuser -P -s evergreen;'
+        echo "Using password $PGPASSWORD for the $PGUSER database user."
+        echo -e "$PGPASSWORD\n$PGPASSWORD\n" | su - postgres sh -c "createuser -P -s $PGUSER;"
     else
-        echo -e "\n\nPlease enter a password for the evergreen database user.\n  If you do not want to edit configs, use \"evergreen\"\n"
-        su - postgres sh -c 'createuser -P -s evergreen;'
+        echo -e "\n\nPlease enter a password for the $PGUSER database user.\n  If you do not want to edit configs, use \"$PGPASSWORD\"\n"
+        su - postgres sh -c "createuser -P -s $PGUSER;"
     fi;
 
     # Apply the DB schema
@@ -441,10 +448,10 @@ function configure_database {
         --create-offline        \
         --update-config $SAMPLEDATA \
         --service all           \
-        --user evergreen        \
-        --password evergreen    \
-        --hostname localhost    \
-        --database evergreen    \
+        --user $PGUSER          \
+        --password $PGPASSWORD  \
+        --hostname $PGHOST      \
+        --database $PGDATABASE  \
         --admin-user $ADMIN_USER \
         --admin-pass $ADMIN_PASS;
     echo Return Value = $?