From: Chris Koeritz Date: Sun, 17 Dec 2017 11:56:40 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.106^2~29 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=63cceb11a7335d153324d71d3a91a021240cc5df;hp=8dd0a085b453b9ec087defa0a9ecb5b92fce03af;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 53464faf..a646a85e 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -140,7 +140,8 @@ fi # https site 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. -search_replace "^[ ]*Header always set Strict-Transport-Security.*" "# not good for cakelampvm.com -- Header always set Strict-Transport-Security \"max-age=63072000; includeSubdomains;\"" /etc/apache2/conf-library/tls-enabling.conf +# note the use of the character class :blank: below to match spaces or tabs. +search_replace "^[[:blank:]]*Header always set Strict-Transport-Security.*" "# not good for cakelampvm.com -- Header always set Strict-Transport-Security \"max-age=63072000; includeSubdomains;\"" /etc/apache2/conf-library/tls-enabling.conf if [ $? -ne 0 ]; then echo the apache tls-enabling.conf file seems to have already been patched to disable strict transport security. good. else