X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=2b021416b3ba7fb66642af5856f11ae29c8dca6d;hb=e768391ab81b189397f0fd19827999365f8b3e33;hp=005f5f1e41fa31e01b01791243dc9cad80b48fd1;hpb=a6f397694069493de49066d033361eda8591cacc;p=feisty_meow.git diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 005f5f1e..2b021416 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -16,29 +16,60 @@ 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: " -read mysql_passwd +# 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 ############## +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" ############## +# 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" @@ -117,6 +152,9 @@ test_or_continue "installing bluefish editor" # which we've done as a prefix on the config for some reason. makes the # code below easy at least. if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then + + sep + # the old site is in place still, so let's update that. echo "Updating default web sites to latest version." @@ -134,7 +172,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" @@ -150,6 +188,8 @@ fi # fix up the apache site so that HSTS is disabled. otherwise we can't view # the https site for cakelampvm.com once the domain name switch has occurred. +sep + # we operate only on our own specialized tls conf file. hopefully no one has messed with it besides revamp. # note the use of the character class :blank: below to match spaces or tabs. search_replace "^[[:blank:]]*Header always set Strict-Transport-Security.*" "# not good for cakelampvm.com -- Header always set Strict-Transport-Security \"max-age=63072000; includeSubdomains;\"" /etc/apache2/conf-library/tls-enabling.conf @@ -166,17 +206,28 @@ fi # as being on the vm. this is already true for some specific sites, but we # want the wildcard enabled to ease the use of DNS for windows folks. +sep + grep -q "\*[[:blank:]]*IN A[[:blank:]]*10.28.42.20" /etc/bind/cakelampvm.com.conf if [ $? -eq 0 ]; then # already present. echo the bind settings for wildcard domains off of cakelampvm.com seems to already be present. else echo " + + +;;;;;; + ; our bind magic, a wildcard domain, for all other sites with cakelampvm.com ; 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\" + +;;;;;; + + + " >> /etc/bind/cakelampvm.com.conf restart_bind echo "successfully added wildcard domains to the cakelampvm.com bind configuration." @@ -185,7 +236,9 @@ fi ############## # fix samba configuration for (ass-headed) default of read-only in user homes. -# why add a necessary feature if you're just going to cripple it by default? +# why cripple a necessary feature by default? + +sep pattern="[#;][[:blank:]]*read only = yes" replacement="read only = no" @@ -200,30 +253,16 @@ 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. - -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. @@ -232,15 +271,70 @@ test_or_die "enabling the new cakelampvm environment config for apache" echo Successfully configured the apache2 environment variables needed for cakelampvm. -############## ############## -# sequel--tell them they're great and show the hello again also. +# add in a swap mount if not already configured. -echo " +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 + +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/ + +############## +############## + +# sequel--tell them they're great and show the hello again also. + +sep + regenerate test_or_die "regenerating feisty meow scripts" chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]* @@ -249,6 +343,9 @@ echo " Thanks for revamping your cakelampvm. :-) + +You may want to update your current shell's feisty meow environment by typing: + regenerate " ##############