Don't check for jail.local...assume we're fresh

virtualmin · Jul 22, 2017 · 667ef13 · 667ef13
1 parent 81c2bd4
commit 667ef13
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 55 deletions.
diff --git a/dist.ini b/dist.ini
@@ -1,5 +1,5 @@
 name    = Virtualmin-Config
-version = 6.0.7
+version = 6.0.8
 author  = Joe Cooper <swelljoe@gmail.com>
 license = GPL_3
 copyright_holder = Joe Cooper
@@ -12,6 +12,8 @@ revision = 2
 [GatherDir]
 exclude_filename = Makefile.PL
 
+[PerlTidy]
+
 [Test::Perl::Critic]
 
 [GithubMeta]

diff --git a/lib/Virtualmin/Config/Plugin/Fail2ban.pm b/lib/Virtualmin/Config/Plugin/Fail2ban.pm
@@ -58,9 +58,6 @@ sub actions {
 }
 
 sub create_fail2ban_jail {
-  if (-e "/etc/fail2ban/jail.local") {
-    die "Fail2ban already has local configuration. Will not overwrite.";
-  }
   open(my $JAIL_LOCAL, '>', '/etc/fail2ban/jail.local');
   print $JAIL_LOCAL <<EOF;
 [sshd]

diff --git a/lib/Virtualmin/Config/Plugin/Fail2banFirewalld.pm b/lib/Virtualmin/Config/Plugin/Fail2banFirewalld.pm
@@ -45,10 +45,11 @@ sub actions {
     foreign_require('init', 'init-lib.pl');
     init::enable_at_boot('fail2ban');
 
+    my $err;
     if (has_command('fail2ban-server')) {
 
       # Create a jail.local with some basic config
-      create_fail2ban_jail();
+      my $err = create_fail2ban_jail();
       create_fail2ban_firewalld();
     }
 
@@ -61,9 +62,6 @@ sub actions {
 }
 
 sub create_fail2ban_jail {
-  if (-e "/etc/fail2ban/jail.local") {
-    die "Fail2ban already has local configuration. Will not overwrite.";
-  }
   open(my $JAIL_LOCAL, '>', '/etc/fail2ban/jail.local');
   print $JAIL_LOCAL <<EOF;
 [sshd]

diff --git a/t/data/etc/webmin/miniserv.conf b/t/data/etc/webmin/miniserv.conf