Merge branch 'release-2.140.109'

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 3b1f35107aac8c252c94b13abc72b4bcbd55da57..2b021416b3ba7fb66642af5856f11ae29c8dca6d 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -16,21 +16,22 @@ export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
 
 export NO_HELLO=right
 source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
+# load dependencies for our script.
 source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
+source "$FEISTY_MEOW_SCRIPTS/security/password_functions.sh"
 
 ##############
 
-# new requirement is to get the sql root password, since we need to do some sql db configuration.
-echo -n "Please enter the MySQL root account password: "
-# turn off echo but remember former setting.
-stty_orig=`stty -g`
-stty -echo
-read mysql_passwd
-# turn echo back on.
-stty $stty_orig
+# it's a requirement to have sql root password, since we may need some sql db configuration.
+load_password /etc/mysql/secret_password mysql_passwd
+if [ -z "$mysql_passwd" ]; then
+  read_password "Please enter the MySQL root account password:" mysql_passwd
+fi
 if [ -z "$mysql_passwd" ]; then
   echo "This script must have the sql root password to proceed."
   exit 1
+else
+  store_password /etc/mysql/secret_password "$mysql_passwd"
 fi
 
 ##############
@@ -39,8 +40,8 @@ sep
 
 echo "Regenerating feisty meow loading dock."
 
-reconfigure_feisty_meow
-test_or_die "feisty meow reconfiguration"
+regenerate
+test_or_die "regenerating feisty meow configuration"
 chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
 test_or_die "fix after reconfigured as sudo"
 
@@ -276,7 +277,8 @@ echo Successfully configured the apache2 environment variables needed for cakela
 
 sep
 
-echo "Checking existing swap partition configuration."
+echo "Checking existing swap partition configuration.
+"
 
 # check for existing swap.
 free | grep -q "Swap:[[:blank:]]*[1-9][0-9]"
@@ -297,7 +299,8 @@ fi
 crontab -l | grep -iq add_swap_mount
 if [ $? -ne 0 ]; then
   # no existing swap setup in crontab, so add it.
-  echo "Adding a boot-time ramdisk swap partition...
+  echo "
+Adding a boot-time ramdisk swap partition...
 "
   # need to do it carefully, since sed won't add lines to a null file.  we thus
   # create a temporary file to do our work in and ignore sed as a tool for this.
@@ -317,6 +320,14 @@ FEISTY_MEOW_APEX=${FEISTY_MEOW_APEX}
 Added boot-time ramdisk swap partition to crontab for root."
 fi
 
+##############
+
+sep
+
+echo Adding site avenger packages to composer.
+# add in site avenger dependencies so we can build avcore properly.
+composer config -g repositories.siteavenger composer https://packages.siteavenger.com/
+
 ##############
 ##############
 
@@ -334,7 +345,7 @@ echo "
 Thanks for revamping your cakelampvm.  :-)
 
 You may want to update your current shell's feisty meow environment by typing:
-  reconfigure_feisty_meow
+  regenerate
 "
 
 ##############