From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 22:48:22 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~2
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=baed4084d174d297d86b6224c0ee608bfba8184a

Merge branch 'dev' of feistymeow.org:feisty_meow into dev
---

baed4084d174d297d86b6224c0ee608bfba8184a
diff --cc scripts/site_avenger/revamp_cakelampvm.sh
index d024cd10,d024cd10..748ea23e
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@@ -16,6 -16,6 +16,7 @@@ export FEISTY_MEOW_APEX="$( \cd "$WORKD
  
  export NO_HELLO=right
  source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
++source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
  
  ##############
  
@@@ -76,10 -76,10 +77,36 @@@ minute on a slower home DSL internet co
  "
  
  apt-get install -y bluefish &> "/tmp/install_bluefish-$(logname).log"
--test_or_continue "failed to install bluefish editor.  not good."
++test_or_continue "installing bluefish editor"
  
  ##############
  
++# we want to upgrade the default apache site to the latest, since the new
++# version mirrors the one on the internet (but with green checks instead
++# of red X's) and since we also support https on the new default version.
++# we can do this again later if needed, by upping the numbers on the apache
++# site config files.
++if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
++  # the old site is in place still, so let's update that.
++  a2dissite 000-default
++  test_or_die "disabling old apache site"
++
++  rm -f /etc/apache2/sites-available/000-default.conf 
++  test_or_die "removing old apache site"
++
++  cp $FEISTY_MEOW_APEX/production/sites/cakelampvm/
++uhhh
++two files for new config
++  test_or_die "installing new apache default sites"
++
++  a2ensite
++thos two configs
++  test_or_die "enabling new apache default sites"
++
++  restart_apache
++
++
++fi
  
  #hmmm: todo
  # deploy the site updater here to fix the local cakelampvm.com site...
diff --cc scripts/system/common_sysadmin.sh
index 223067f6,223067f6..4ab80ed3
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@@ -181,7 -181,7 +181,7 @@@ function restart_bind(
      echo "The bind service did not restart properly.  Please check the error logs."
      exit 1
    fi
--  echo DNS server restarted.
++  echo DNS service restarted.
  }
  
  ############################################################################
@@@ -317,6 -317,6 +317,7 @@@ function restart_apache(
      echo "Please consult the apache error logs for more details."
      exit 1
    fi
++  echo Apache2 service restarted.
  }
  
  # sets up the serverpilot storage location for a user hosted web site.