From: Chris Koeritz Date: Sun, 17 Dec 2017 13:15:36 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.106^2~27 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ee03bf7253ca3fb5f8d80440eaad26d5e6db07a1;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev oops, somehow was hosing this up. should be best of both versions now. --- ee03bf7253ca3fb5f8d80440eaad26d5e6db07a1 diff --cc scripts/site_avenger/revamp_cakelampvm.sh index 8370cbde,b1757c44..239a7f14 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@@ -151,8 -151,32 +151,29 @@@ f ############## - # + # fix up bind so that we think of any address with cakelampvm.com on the end + # 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. + + 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. good deal. + 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" + " >> /etc/bind/cakelampvm.com.conf + + restart_bind + + ############## + - - - + ############## ############## # sequel--tell them they're great and show the hello again also.