X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=180574eb3f9cd35f12f44cbb19be2ac8b4301006;hb=416de6a3e53c423729483b92e3b316959be6677b;hp=ece38d9b536efe216709611631abac20248f7c86;hpb=19100b69028fcf9c22228dcc36abee4f62ab40f8;p=feisty_meow.git diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index ece38d9b..180574eb 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -22,7 +22,12 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.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 if [ -z "$mysql_passwd" ]; then echo "This script must have the sql root password to proceed." exit 1 @@ -41,6 +46,29 @@ test_or_die "fix after reconfigured as sudo" ############## +# set up some crucial users in the mysql db that we seem to have missed previously. + +sep + +echo "Adding users to the mysql database." + +#hmmm: good application for hiding output unless error here. +mysql -u root -p"$mysql_passwd" &>/dev/null < "/tmp/install_bluefish-$(logname).log" test_or_continue "installing bluefish editor" @@ -143,7 +171,7 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then # copy in our new version of the default page. #hmmm: would be nice if this worked without mods for any new version, besides just 001. see apache env var file below for example implem. - cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \ + \cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \ /etc/apache2/sites-available test_or_die "installing new apache default sites" @@ -193,7 +221,7 @@ else ; in the domain. this forces any other sites besides the ones above to route ; to the actual vm IP address, which currently is singular and very fixated. * IN A 10.28.42.20 - IN HINFO "linux vm" "ubuntu" + IN HINFO \"linux vm\" \"ubuntu\" ;;;;;; @@ -224,24 +252,6 @@ echo successfully patched the samba configuration to enable writes on user home ############## -# set up some crucial users in the mysql db that we seem to have missed previously. - -sep - -mysql -u root -p"$mysql_passwd" </dev/null # plug in the new version, just stomping anything there. # note: we only expect to have one version of the env_vars dir at a time in place in feisty... -cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/env_vars.*/env_vars_cakelampvm.conf /etc/apache2/conf-available +\cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/env_vars.*/env_vars_cakelampvm.conf /etc/apache2/conf-available test_or_die "copying environment variables file into place" # enable the new version of the config file. @@ -260,6 +270,71 @@ test_or_die "enabling the new cakelampvm environment config for apache" echo Successfully configured the apache2 environment variables needed for cakelampvm. +############## + +# add in a swap mount if not already configured. + +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 current boot session." +fi + +# the above just gives this session a swap partition, but we want to have +# the vm boot with one also. + +# check if there is already swap mentioned in the root crontab. we will get root's +# crontab below since this script has to run as sudo. +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)" + crontab -l 2>/dev/null >"$tmpfile" + echo " +# need to explicitly set any variables we will use. +FEISTY_MEOW_APEX=${FEISTY_MEOW_APEX} +# add swap space to increase memory available. +@reboot bash $FEISTY_MEOW_APEX/scripts/system/add_swap_mount.sh +" >>"$tmpfile" + # now install our new version of the crontab. + crontab "$tmpfile" + rm "$tmpfile" + + echo " +Added boot-time ramdisk swap partition to crontab for root." +fi + +############## + +sep + +# repair the google config key for mapsdemo, which lives over in fred's account. +search_replace \ + "^[[:blank:]]*'key'[[:blank:]]*=>[[:blank:]]*'AIzaSyCd2kfOBf8tyd-_m2aM_ayMoAq8r_M1yUk'," \ + "\t'key' => 'AIzaSyCvKs62XudEWPZpA21rCGI1Dkh6UxSQzzQ'," \ + ~fred/apps/mapsdemo/avenger5/config/config_google.php + +if [ $? -ne 0 ]; then + echo Google config key for mapsdemo in fred account seems to already be patched. +else + echo Patched the google config key for mapsdemo app in fred account. +fi + ############## ############## @@ -275,6 +350,9 @@ echo " Thanks for revamping your cakelampvm. :-) + +You may want to update your current shell's feisty meow environment by typing: + reconfigure_feisty_meow " ##############