X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=ea31020f1d2cd4dfcbb28971305940bcc9a90177;hb=92ecdb5b078097b9887d5e9a8ebc7a3804336efc;hp=fa9d0361511f240f4d54269805fbc31917e3a93f;hpb=1bac4cbe9130fce1a9bf8bf70dbf4c004f29d19f;p=feisty_meow.git diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index fa9d0361..ea31020f 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -109,6 +109,9 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then a2enmod ssl test_or_die "enabling SSL for secure websites" + restart_apache + test_or_die "getting SSL loaded in apache" + a2dissite 000-default test_or_die "disabling old apache site" @@ -129,47 +132,15 @@ fi ############## -# clean out some old files that were not checked in in mapsdemo. -echo Doing some git repository maintenance in fred account. -# -# change over to fred folder -pushd /home/fred -test_or_die "changing dir to fred's home; what have you done with fred?" - -pushd apps/mapsdemo/avenger5 -test_or_die "changing dir to mapsdemo app" - -rpuffer . &>/dev/null -if [ $? -ne 0 ]; then - # it seems our old files are still conflicting this. - if [ -f config/config_google.php ]; then - \rm -f config/config_google.php - test_or_die "removing old config for google" - fi - if [ -f config/app.php ]; then - \rm -f config/app.php - test_or_die "removing old config for app" - fi - - git reset --hard HEAD - test_or_die "resetting git's hard head" - - rpuffer . -#hmmm: use output saver thing when that exists. - test_or_die "puffing out mapsdemo app after inadequate corrective action was taken" -fi - -popd - -popd -#...coolness, if we got to here. - ############## # sequel--tell them they're great and show the hello again also. -regenerate +echo " + +" +regenerate echo "