diff --git a/fail2ban/config.sls b/fail2ban/config.sls index d065859..a9574da 100644 --- a/fail2ban/config.sls +++ b/fail2ban/config.sls @@ -1,6 +1,7 @@ {% from "fail2ban/map.jinja" import fail2ban with context %} include: + - fail2ban.deprecated - fail2ban {{ fail2ban.prefix }}/etc/fail2ban/fail2ban.local: diff --git a/fail2ban/init.sls b/fail2ban/init.sls index f3f917d..3c8f3c8 100644 --- a/fail2ban/init.sls +++ b/fail2ban/init.sls @@ -1,5 +1,8 @@ {% from "fail2ban/map.jinja" import fail2ban with context %} +include: + - fail2ban.deprecated + fail2ban: pkg.installed: - name: {{ fail2ban.package }} diff --git a/fail2ban/ng/config.sls b/fail2ban/ng/config.sls index 7fad6da..4f4ae1d 100644 --- a/fail2ban/ng/config.sls +++ b/fail2ban/ng/config.sls @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- # vim: ft=sls +include: + - fail2ban.deprecated + {% from "fail2ban/ng/map.jinja" import fail2ban with context %} fail2ban.ng.config.fail2ban: diff --git a/fail2ban/ng/init.sls b/fail2ban/ng/init.sls index 2bdc897..1da16a6 100644 --- a/fail2ban/ng/init.sls +++ b/fail2ban/ng/init.sls @@ -2,6 +2,7 @@ # vim: ft=sls include: + - fail2ban.deprecated - fail2ban.ng.install - fail2ban.ng.config - fail2ban.ng.service diff --git a/fail2ban/ng/install.sls b/fail2ban/ng/install.sls index c269bfc..48ecc5a 100644 --- a/fail2ban/ng/install.sls +++ b/fail2ban/ng/install.sls @@ -3,6 +3,9 @@ {% from "fail2ban/ng/map.jinja" import fail2ban with context %} +include: + - fail2ban.deprecated + fail2ban.ng.install: pkg.installed: - name: {{ fail2ban.package }} diff --git a/fail2ban/ng/service.sls b/fail2ban/ng/service.sls index caf7352..26d24d3 100644 --- a/fail2ban/ng/service.sls +++ b/fail2ban/ng/service.sls @@ -3,6 +3,9 @@ {% from "fail2ban/ng/map.jinja" import fail2ban with context %} +include: + - fail2ban.deprecated + fail2ban.ng.service: {% if ( 'enabled' in fail2ban and fail2ban.enabled ) or ('enabled' not in fail2ban ) %} service.running: