From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 22:57:32 +0000 (-0500)
Subject: new production site for cakelampvm.com
X-Git-Tag: 2.140.101^2~1^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=50d3d10749cc83c709864a9713aeef8960cd00e1;p=feisty_meow.git

new production site for cakelampvm.com

this is the site that lives on the vm, and now it should properly show the local vm version (ala green checks not red X's).
---

diff --git a/production/sites/cakelampvm.com/rolling/default_page.001/001-default-http.conf b/production/sites/cakelampvm.com/rolling/default_page.001/001-default-http.conf
new file mode 100644
index 00000000..13600811
--- /dev/null
+++ b/production/sites/cakelampvm.com/rolling/default_page.001/001-default-http.conf
@@ -0,0 +1,21 @@
+
+
+<Directory "/opt/feistymeow.org/feisty_meow/production/sites/cakelampvm.com">
+  Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+  Require all granted
+</Directory>
+
+
+<VirtualHost *:80>
+	ServerName cakelampvm.com
+	ServerAlias www.cakelampvm.com
+	DocumentRoot /opt/feistymeow.org/feisty_meow/production/sites/cakelampvm.com
+	DirectoryIndex vm_index.html
+
+	ServerAdmin developer@localhost
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>
+
diff --git a/production/sites/cakelampvm.com/rolling/default_page.001/001-default-ssl.conf b/production/sites/cakelampvm.com/rolling/default_page.001/001-default-ssl.conf
new file mode 100644
index 00000000..c89b4590
--- /dev/null
+++ b/production/sites/cakelampvm.com/rolling/default_page.001/001-default-ssl.conf
@@ -0,0 +1,37 @@
+
+
+<Directory "/opt/feistymeow.org/feisty_meow/production/sites/cakelampvm.com">
+  Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+  Require all granted
+</Directory>
+
+<VirtualHost *:443>
+	ServerName cakelampvm.com
+	ServerAlias www.cakelampvm.com
+	DocumentRoot /opt/feistymeow.org/feisty_meow/production/sites/cakelampvm.com
+	DirectoryIndex vm_index.html
+
+	ServerAdmin developer@localhost
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	SSLEngine on
+
+	#   A self-signed (snakeoil) certificate can be created by installing
+	#   the ssl-cert package. See
+	#   /usr/share/doc/apache2/README.Debian.gz for more info.
+	#   If both key and certificate are stored in the same file, only the
+	#   SSLCertificateFile directive is needed.
+	SSLCertificateFile	/etc/ssl/certs/ssl-cert-snakeoil.pem
+	SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+	<FilesMatch "\.(cgi|shtml|phtml|php)$">
+			SSLOptions +StdEnvVars
+	</FilesMatch>
+	<Directory /usr/lib/cgi-bin>
+			SSLOptions +StdEnvVars
+	</Directory>
+
+</VirtualHost>
+
diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 748ea23e..2280dc95 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -81,11 +81,15 @@ test_or_continue "installing bluefish editor"
 
 ##############
 
+# deploy any site updates here to the VM's cakelampvm.com site.
+#
 # 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.
+# site config files.  our original site was 000 and the new version is 001,
+# 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
   # the old site is in place still, so let's update that.
   a2dissite 000-default
@@ -94,24 +98,18 @@ if [ -l /etc/apache2/sites-enabled/000-default.conf ]; then
   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
+  # copy in our new 000 version (which  
+  cp $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \
+      /etc/apache2/sites-available
   test_or_die "installing new apache default sites"
 
-  a2ensite
-thos two configs
+  # there should only be ours at this version level and with that prefix.
+  a2ensite 001-*
   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...
-
-
 ##############
 
 # sequel--tell them they're great and show the hello again also.