X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=d86a35d7e169b4f4ac6fded904a80a28b9bf11f3;hb=92fc2f3536f565fda60e6a91751b317b90be6cc1;hp=62cb3a7b1e4341db151cf1b4afd9d6e7d34f8721;hpb=118398d89faf1a6261b13a4c31ddaac55c92cd3c;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 62cb3a7b..d86a35d7 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -16,21 +16,36 @@ 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
+# new requirement to have the sql root password, since we need to do some sql db configuration.
+
+echo A
+mysql_passwd="$(load_password /etc/mysql/secret_password)"
+echo B
+if [ -z "$mysql_password" ]; then
+echo C
+  mysql_password="$(read_password "Please enter the MySQL root account password:")"
+echo D
+#  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
+fi
 if [ -z "$mysql_passwd" ]; then
+echo E
   echo "This script must have the sql root password to proceed."
   exit 1
+else
+echo F
+  store_password /etc/mysql/secret_password "$mysql_password"
 fi
 
 ##############
@@ -39,8 +54,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,13 +291,18 @@ echo Successfully configured the apache2 environment variables needed for cakela
 
 sep
 
+echo "Checking existing swap partition configuration.
+"
+
 # check for existing swap.
 free | grep -q "Swap:[[:blank:]]*[1-9][0-9]"
 if [ $? -ne 0 ]; then
   # no swap in current session, so add it.
+  echo "Enabling ramdisk swap partition...
+"
   add_swap_mount
-
-  echo "Enabled ramdisk swap partition for the current boot session."
+  echo "
+Enabled ramdisk swap partition for current boot session."
 fi
 
 # the above just gives this session a swap partition, but we want to have
@@ -293,6 +313,9 @@ 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...
+"
   # 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.
   tmpfile="$(mktemp junk.XXXXXX)"
@@ -307,9 +330,16 @@ FEISTY_MEOW_APEX=${FEISTY_MEOW_APEX}
   crontab "$tmpfile"
   rm "$tmpfile"
 
-  echo "Added boot-time ramdisk swap partition to crontab for root."
+  echo "
+Added boot-time ramdisk swap partition to crontab for root."
 fi
 
+##############
+
+sep
+
+# next bit can go here.
+
 ##############
 ##############
 
@@ -327,7 +357,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
 "
 
 ##############