From 28fba64c55402cf38f105de8e45db0721ca0a962 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 2 Feb 2023 23:35:06 +0100 Subject: [PATCH] variable files blacklist --- roles/deploy-web/files/blacklist.sh | 15 +++++++++------ roles/deploy-web/files/getinfo_month.sh | 2 +- roles/deploy-web/files/getinfo_week.sh | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/roles/deploy-web/files/blacklist.sh b/roles/deploy-web/files/blacklist.sh index 5e47529..848a680 100755 --- a/roles/deploy-web/files/blacklist.sh +++ b/roles/deploy-web/files/blacklist.sh @@ -2,8 +2,9 @@ MAIL=/tmp/mail SERVER_LOG=/var/log/nginx HOST=($(cat /etc/sentinel/virtualhost)) -if [ ! -f /tmp/blacklist ]; then - touch /tmp/blacklist +BLACKLIST=/etc/sentinel/blacklist +if [ ! -f ${BLACKLIST} ]; then + touch ${BLACKLIST} fi for i in ${HOST[@]} do @@ -12,11 +13,13 @@ do tail -n 50 $log_access | 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 /tmp/blacklist -v |sort |uniq |wc -l) + count=$(cat /tmp/blacklist_404 /tmp/blacklist_400 |grep -f ${BLACKLIST} -v |sort |uniq |wc -l) if [ ${count} -ne 0 ]; then - cat /tmp/blacklist_400 /tmp/blacklist_404 |grep -f /tmp/blacklist -v |sort |uniq >> /tmp/blacklist - echo "IP blacklisté : " > ${MAIL} - cat /tmp/blacklist >> ${MAIL} + echo "Nouvelle IP blacklisté" > ${MAIL} + cat /tmp/blacklist_400 /tmp/blacklist_404 |grep -f ${BLACKLIST} -v |sort |uniq >> ${MAIL} + echo "IP dejà blacklisté : " >> ${MAIL} + cat /tmp/blacklist_400 /tmp/blacklist_404 |grep -f ${BLACKLIST} -v |sort |uniq >> /tmp/blacklist + cat ${BLACKLIST} >> ${MAIL} cat ${MAIL} |mail -s "Blacklist IP ${i}" valczebackup@gmail.com fi #rm $directory_host/* diff --git a/roles/deploy-web/files/getinfo_month.sh b/roles/deploy-web/files/getinfo_month.sh index f8c0f0f..b563ae4 100755 --- a/roles/deploy-web/files/getinfo_month.sh +++ b/roles/deploy-web/files/getinfo_month.sh @@ -23,6 +23,6 @@ do cat $directory_host/${j}_* |sort |uniq -c >> ${MAIL} echo "----------------" >> ${MAIL} done - cat ${MAIL} |mail -s "Rapport hebdomadaire reverse proxy $DATE" valczebackup@gmail.com + cat ${MAIL} |mail -s "Rapport mensuel reverse proxy ${i} $DATE" valczebackup@gmail.com rm -rf $directory_host done diff --git a/roles/deploy-web/files/getinfo_week.sh b/roles/deploy-web/files/getinfo_week.sh index 636e480..f54e4b0 100755 --- a/roles/deploy-web/files/getinfo_week.sh +++ b/roles/deploy-web/files/getinfo_week.sh @@ -36,6 +36,6 @@ do cat $directory_host/${j}_* |sort |uniq -c >> ${MAIL} echo "----------------" >> ${MAIL} done - cat ${MAIL} |mail -s "Rapport hebdomadaire reverse proxy $DATE" valczebackup@gmail.com + cat ${MAIL} |mail -s "Rapport hebdomadaire reverse proxy ${i} $DATE" valczebackup@gmail.com #rm $directory_host/* done