From: Chris Koeritz Date: Sun, 17 Dec 2017 13:16:40 +0000 (+0000) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.106^2~9^2~1 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=978cd7ca1f251b793ad42a27fb540ab4a9008347;hp=2d17e1b53118b61a994c3096271833256d5f8636;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html index 88317904..2b285a6d 100644 --- a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html +++ b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html @@ -271,7 +271,7 @@ href="http://mapsdemo.cakelampvm.com">http://mapsdemo.cakelampvm.com

Setting up DNS on Windows

The ipconfig tool will provide helpful information about your current networking and DNS configuration:

- 
> ipconfig --all
+ 
> ipconfig /all

The DNS configuration on Windows is somewhat byzantine.  The pipe characters ('|') below are used to separate the menus or tabs or dialogs to traverse.  Follow this path to get to the DNS config:

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index b1757c44..239a7f14 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -137,7 +137,7 @@ fi ############## # fix up the apache site so that HSTS is disabled. otherwise we can't view -# https site once the domain name switch has occurred. +# the https site for cakelampvm.com once the domain name switch has occurred. # 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. @@ -173,9 +173,6 @@ restart_bind ############## - - - ############## ##############