Add configurable EG username/password

Instead of hardcoding admin/evergreen123

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>

diff --git a/config.example b/config.example
index 2fc681e..e68486b 100644 (file)
--- a/config.example
+++ b/config.example
@@ -20,6 +20,10 @@ EGVMSIPSERVERWORKING=git://git.evergreen-ils.org/working/SIPServer
 # Not that having it configurable matters overly much, but we need one
 EGVMPGPASS=neergreve
 
+# Evergreen Admin Username and Password
+EGVMEGUSER=admin
+EGVMEGPASS=evergreen123
+
 # Dojo URL
 # Defaulting to the copy we use for make_release
 EGVMDOJOURL=http://evergreen-ils.org/downloads/dojo.tgz

diff --git a/scripts/postbuild.sh b/scripts/postbuild.sh
index ade3abb..3bbcd4a 100755 (executable)
--- a/scripts/postbuild.sh
+++ b/scripts/postbuild.sh
@@ -151,7 +151,7 @@ cd /home/opensrf/Evergreen
 perl Open-ILS/src/support-scripts/eg_db_config --update-config \\
 --service all --create-database --create-schema --create-offline \\
 --user evergreen --password $EGVMPGPASS --hostname localhost --port 5432 \\
---database evergreen --admin-user admin --admin-pass evergreen123 --load-all-sample
+--database evergreen --admin-user $EGVMEGUSER --admin-pass $EGVMEGPASS --load-all-sample
 
 # Start Evergreen up!
 osrf_control --localhost --start-all

diff --git a/setupvm b/setupvm
index 4df36e2..49ccc5f 100755 (executable)
--- a/setupvm
+++ b/setupvm
@@ -31,6 +31,12 @@ fi
 if [ "$EGVMPGPASS" = "" ]; then
     EGVMMISSINGCONFIG="EGVMPGPASS $EGVMMISSINGCONFIG"
 fi
+if [ "$EGVMEGUSER" = "" ]; then
+    EGVMMISSINGCONFIG="EGVMEGUSER $EGVMMISSINGCONFIG"
+fi
+if [ "$EGVMEGPASS" = "" ]; then
+    EGVMMISSINGCONFIG="EGVEPGPASS $EGVMMISSINGCONFIG"
+fi
 if [ "$EGVMDOJOURL" = "" ]; then
     EGVMMISSINGCONFIG="EGVMDOJOURL $EGVMMISSINGCONFIG"
 fi