Version 1.0.0 Candidate

ANXS · Mar 18, 2014 · e3ae933 · e3ae933
1 parent 884c630
commit e3ae933
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -30,14 +30,14 @@ For each of the services you wish to protect/put a jail or ban up for, you need
 
 ```yaml
 fail2ban_services:
-  - name: ssh
-    enabled: true
-    port: ssh
-    filter: sshd
-    logpath: /var/log/auth.log
+  - name: "ssh"
+    enabled: "true"
+    port: "ssh"
+    filter: "sshd"
+    logpath: "/var/log/auth.log"
     maxretry: 6
-    protocol: tcp                       (optional)
-    action: action_                     (optional)
+    protocol: "tcp"                     (optional)
+    action: "action_ "                  (optional)
     banaction: "iptables-multiport"     (optional)
 ```
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -20,9 +20,9 @@ fail2ban_action: "action_"
 fail2ban_auth_log: "/var/log/auth.log"
 
 fail2ban_services:
-  - name: ssh
-    enabled: true
-    port: ssh
-    filter: sshd
-    logpath: /var/log/auth.log
+  - name: "ssh"
+    enabled: "true"
+    port: "ssh"
+    filter: "sshd"
+    logpath: "/var/log/auth.log"
     maxretry: 6
diff --git a/services_examples.md b/services_examples.md
@@ -3,7 +3,7 @@
 ###### ssh/dropbear/...
 ```yaml
   - name: ssh
-    enabled: true
+    enabled: "true"
     port: ssh
     filter: sshd
     logpath: /var/log/auth.log
@@ -13,7 +13,7 @@
 ```yaml
 fail2ban_services:
   - name: pam-generic
-    enabled: true
+    enabled: "true"
     port: all
     filter: pam-generic
     logpath: /var/log/auth.log
@@ -25,7 +25,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: xinetd-fail
-    enabled: true
+    enabled: "true"
     port: all
     filter: xinetd-fail
     logpath: /var/log/daemon.log
@@ -37,7 +37,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: ssh-ddos
-    enabled: true
+    enabled: "true"
     port: ssh
     filter: ssh-ddos
     logpath: /var/log/auth.log
@@ -48,7 +48,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: apache
-    enabled: true
+    enabled: "true"
     port: http,https
     filter: apache-auth
     logpath: /var/log/apache*/*error.log
@@ -59,7 +59,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: apache-multiport
-    enabled: true
+    enabled: "true"
     port: http,https
     filter: apache-auth
     logpath: /var/log/apache*/*error.log
@@ -71,7 +71,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: apache-noscript
-    enabled: true
+    enabled: "true"
     port: http,https
     filter: apache-noscript
     logpath: /var/log/apache*/*error.log
@@ -82,7 +82,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: apache-overflows
-    enabled: true
+    enabled: "true"
     port: http,https
     filter: apache-overflows
     logpath: /var/log/apache*/*error.log
@@ -93,7 +93,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: vsftpd
-    enabled: true
+    enabled: "true"
     port: ftp,ftp-data,ftps,ftps-data
     filter: vsftpd
     logpath: /var/log/vsftpd.log
@@ -104,7 +104,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: proftpd
-    enabled: true
+    enabled: "true"
     port: ftp,ftp-data,ftps,ftps-data
     filter: proftpd
     logpath: /var/log/proftpd/proftpd.log
@@ -115,7 +115,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: postfix
-    enabled: true
+    enabled: "true"
     port: smtp, ssmtp
     filter: postfix
     logpath: /var/log/mail.log
@@ -126,7 +126,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: couriersmtp
-    enabled: true
+    enabled: "true"
     port: smtp,ssmtp
     filter: couriersmtp
     logpath: /var/log/mail.log
@@ -137,7 +137,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: courierauth
-    enabled: true
+    enabled: "true"
     port: smtp,ssmtp,imap2,imap3,imaps,pop3,pop3s
     filter: courierlogin
     logpath: /var/log/mail.log
@@ -148,7 +148,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: sasl
-    enabled: true
+    enabled: "true"
     port: smtp,ssmtp,imap2,imap3,imaps,pop3,pop3s
     filter: sasl
     logpath: /var/log/mail.log
@@ -159,7 +159,7 @@ fail2ban_services:
 ```yaml
 fail2ban_services:
   - name: dovecot
-    enabled: true
+    enabled: "true"
     port: smtp,ssmtp,imap2,imap3,imaps,pop3,pop3s
     filter: dovecot
     logpath: /var/log/mail.log

diff --git a/templates/etc_fail2ban_jail.conf.j2 b/templates/etc_fail2ban_jail.conf.j2
@@ -105,7 +105,7 @@ protocol = {{service.protocol}}
 {% if service.action is defined %}
 action = %({{service.action}})s
 {% endif %}
-<% if param['banaction'] %>
+{% if service.banaction is defined %}
 banaction = {{service.banaction}}
 {% endif %}