From 1d8d2d010f32e82d2fd93dab99e9152fe96cfb35 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 17 May 2014 15:16:15 -0700
Subject: [PATCH] More work on default jail page

---
 fail2ban/edit_jaildef.cgi | 30 ++++++++++++++++++++++++------
 fail2ban/lang/en          | 10 +++++++++-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/fail2ban/edit_jaildef.cgi b/fail2ban/edit_jaildef.cgi
index 4e9f3fa5f..865f221c2 100644
--- a/fail2ban/edit_jaildef.cgi
+++ b/fail2ban/edit_jaildef.cgi
@@ -46,18 +46,36 @@ print &ui_table_row($text{'jail_ignoreip'},
 			$text{'default'}." (".$def_ignoreip.")"));
 
 # Backend to check for file changes
-# XXX
-my $backend;
+my $backend = &find_value("backend", $jail);
+print &ui_table_row($text{'jail_backend'},
+	&ui_select("backend", $backend || "auto",
+		   [ [ "auto", $text{'jail_auto'} ],
+		     [ "gamin", $text{'jail_gamin'} ],
+		     [ "polling", $text{'jail_polling'} ] ]));
 
 # Email destination
-# XXX
-my $destemail;
+my $destemail = &find_value("destemail", $jail);
+print &ui_table_row($text{'jail_destemail'},
+	&ui_opt_textbox("destemail", $destemail, 40,
+			$text{'jail_none'}));
 
 # Default ban action
-my $banaction;
+my @actions = &list_actions();
+my $banaction = &find_value("banaction", $jail);
+print &ui_table_row($text{'jail_banaction'},
+	&ui_select("banaction", $banaction,
+	   [ [ "", "&lt;$text{'jail_none'}&gt;" ],
+	     map { &filename_to_name($_->[0]->{'file'}) } @actions ],
+	   1, 0, $banaction ? 1 : 0));
 
 # Default protocol to ban
-my $protocol;
+my $protocol = &find_value("protocol", $jail);
+print &ui_table_row($text{'jail_defprotocol'},
+	&ui_select("protocol", $protocol,
+		   [ [ '', "&lt;$text{'jail_none'}&gt;" ],
+		     [ 'tcp', 'TCP' ],
+		     [ 'udp', 'UDP' ],
+		     [ 'icmp', 'ICMP' ] ]));
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'save'} ] ]);
diff --git a/fail2ban/lang/en b/fail2ban/lang/en
index 2fab49400..ee9b81a81 100644
--- a/fail2ban/lang/en
+++ b/fail2ban/lang/en
@@ -76,7 +76,7 @@ jails_enabled=Enabled?
 jails_action=Resulting actions
 jails_delete=Delete Selected Jails
 jails_def=Edit Jail Defaults
-jails_defdesc=Edit default settings and limits that apply to all the jails listed above.
+jails_defdesc=Edit default settings and limits that apply to all the jails listed above, such as the number of required matches and the time to ban an IP for.
 jails_return=list of jails
 jails_derr=Failed to delete jails
 jails_enone=None selected
@@ -110,6 +110,14 @@ jail_elogpath=All log files must be absolute paths or patterns
 jail_emaxretry=Matches before applying action must be a number greater than zero
 jail_efindtime=Delay between matches must be a number greater than zero
 jail_ebantime=Time to ban an IP must be a number greater than zero
+jail_backend=Check for log file updates using
+jail_auto=Decide automatically
+jail_gamin=Gamin file alteration monitor
+jail_polling=Background polling
+jail_destemail=Default notification email
+jail_none=None set
+jail_banaction=Default action to apply
+jail_defprotocol=Default protocol for actions
 
 jaildef_title=Default Jail Options
 jaildef_header=Defaults for all jails