diff --git a/roles/deploy-web/files/blacklist.sh b/roles/deploy-web/files/blacklist.sh index 4d65ec8..d63169c 100755 --- a/roles/deploy-web/files/blacklist.sh +++ b/roles/deploy-web/files/blacklist.sh @@ -18,7 +18,7 @@ do cat /tmp/error_$i | awk -F "|" '{ if($2 == "400") print $1}' > /tmp/400_$i cat /tmp/404_$i | sort | uniq -c | awk '{ if($1 >= 5) print $2}' > /tmp/blacklist_404 cat /tmp/400_$i |sort | uniq -c |awk '{ if($1 >= 5) print $2}' > /tmp/blacklist_400 - count=$(cat /tmp/blacklist_404 /tmp/blacklist_400 |grep -f ${BLACKLIST} -v |sort |uniq |wc -l) + count=$(cat /tmp/blacklist_404 /tmp/blacklist_400 |grep -f ${BLACKLIST} -v |grep -f ${EXCLUDE} -v |sort |uniq |wc -l) if [ ${count} -ne 0 ]; then echo "Nouvelle IP blacklisté" > ${MAIL} list_ip=($(cat /tmp/blacklist_400 /tmp/blacklist_404 |grep -f ${BLACKLIST} -v |grep -f ${EXCLUDE} -v |sort |uniq)) diff --git a/roles/deploy-web/files/gouter b/roles/deploy-web/files/gouter index 59fe4db..ab5becd 100644 --- a/roles/deploy-web/files/gouter +++ b/roles/deploy-web/files/gouter @@ -1,4 +1,14 @@ server { + if ($host = clarissariviere.fr) { + return 301 https://"www.clarissariviere.fr"$request_uri; + } # managed by Certbot + + + if ($host = clarissariviere.com) { + return 301 https://"www.clarissariviere.com"$request_uri; + } # managed by Certbot + + access_log /var/log/nginx/clarissa_access.log main; error_log /var/log/nginx/clarissa_error.log; #gzip_static off; @@ -28,6 +38,7 @@ server { #proxy_set_header X-Forwarded-Proto $scheme; sub_filter 'gouters.canalblog.com' "$host"; sub_filter '' ''; + #sub_filter '' ''; sub_filter_types text/html text/xml text/plain text/css; sub_filter_once off; @@ -67,12 +78,12 @@ server { if ($host = clarissariviere.fr) { - return 301 https://$host$request_uri; + return 301 https://"www.clarissariviere.fr"$request_uri; } # managed by Certbot if ($host = clarissariviere.com) { - return 301 https://$host$request_uri; + return 301 https://"www.clarissariviere.com"$request_uri; } # managed by Certbot