diff --git a/tests/travis.sh b/tests/travis.sh index 6d0d4fc..8ac410b 100644 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -15,11 +15,11 @@ export LANG='en_US.UTF-8' export LC_ALL='C.UTF-8' if [ -z "$1" ]; then -{ - apt-get -qq purge mysql* graphviz* redis* php73-* php-* - apt-get install -qq git python3-setuptools python3-dev python3-apt ccze tree - sudo apt-get -qq autoremove --purge -} > /dev/null 2>&1 + { + apt-get -qq purge mysql* graphviz* redis* php73-* php-* + apt-get install -qq git python3-setuptools python3-dev python3-apt ccze tree + sudo apt-get -qq autoremove --purge + } >/dev/null 2>&1 fi exit_script() { @@ -349,3 +349,18 @@ for stack in $stack_purge; do fi done + +echo -e "${CGREEN}#############################################${CEND}" +echo -e ' wo stack fail2ban ' +echo -e "${CGREEN}#############################################${CEND}" +if { + wo stack install --fail2ban +} >>/var/log/wo/test.log; then + echo -ne " purging $stack [${CGREEN}OK${CEND}]\\r" + echo -ne '\n' +else + echo -e " purging $stack [${CRED}FAIL${CEND}]" + echo -ne '\n' + exit_script + +fi diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index f93b84d..1cdbb8d 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -1042,7 +1042,8 @@ def post_pref(self, apt_packages, packages, upgrade=False): WOGit.add(self, ["/etc/fail2ban"], msg="Adding Fail2ban into Git") Log.info(self, "Configuring Fail2Ban") - data = dict(release=WOVar.wo_version) + nginxf2b = bool(os.path.exists('/var/log/nginx')) + data = dict(release=WOVar.wo_version, nginx=nginxf2b) WOTemplate.deploy( self, '/etc/fail2ban/jail.d/custom.conf', diff --git a/wo/cli/templates/fail2ban.mustache b/wo/cli/templates/fail2ban.mustache index 6d918cd..908a4f4 100644 --- a/wo/cli/templates/fail2ban.mustache +++ b/wo/cli/templates/fail2ban.mustache @@ -4,7 +4,7 @@ ignoreip = 127.0.0.1/8 ::1 [recidive] enabled = true -[nginx-http-auth] +{{#nginx}}[nginx-http-auth] enabled = true logpath = /var/log/nginx/*error*.log @@ -23,4 +23,4 @@ maxretry = 5 enabled = true filter = nginx-forbidden action = iptables-multiport[name="nginx-forbidden", port="http,https"] -logpath = /var/log/nginx/*error*.log +logpath = /var/log/nginx/*error*.log{{/nginx}} \ No newline at end of file