Bump rev 6.0.20

Makefile.PL

@@ -19,7 +19,7 @@ my %WriteMakefileArgs = (
     {"Log::Log4perl" => 0, "Term::ANSIColor" => 0, "Term::Spinner::Color" => 0},
   "TEST_REQUIRES" =>
     {"ExtUtils::MakeMaker" => 0, "File::Spec" => 0, "Test::More" => 0},
-  "VERSION" => "6.0.19",
+  "VERSION" => "6.0.20",
   "test"    => {"TESTS" => "t/*.t"}
 );
 

bin/virtualmin-config-system

@@ -3,7 +3,9 @@ use strict;
 use warnings;
 use 5.010_001;
 use Getopt::Long;
-use Pod::Usage;
+BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
+use Pod::Usage qw(pod2usage);
+use Term::ANSIColor qw(:constants);
 use Virtualmin::Config;
 
 sub main {
@@ -20,26 +22,36 @@ sub main {
   if ($opt{'list-bundles'}) {
     my $config  = Virtualmin::Config->new();
     my @bundles = $config->list_bundles();
-    say "Available Configuration bundles:\n";
+    say YELLOW . "Available Configuration Bundles:\n";
+    my $numcols = 4;
+    my $cur     = 0;
+    printf "  ";
     for my $b (@bundles) {
-      say "  $b";
+      printf(CYAN . "%-18s ", $b);
+      $cur++;
+      if ($cur == $numcols) { $cur = 0; printf "\n  " . RESET; }
     }
     say '';
     exit 0;
   }
   if ($opt{'list-plugins'}) {
     my $config  = Virtualmin::Config->new();
     my @plugins = $config->list_plugins();
-    say "Available Plugins:\n";
+    say YELLOW . "Available Plugins:\n";
+    my $numcols = 4;
+    my $cur     = 0;
+    printf "  ";
     for my $p (@plugins) {
-      say "  $p";
+      printf(CYAN . "%-18s ", $p);
+      $cur++;
+      if ($cur == $numcols) { $cur = 0; printf "\n  " . RESET; }
     }
     say '';
     exit 0;
   }
 
   unless ($opt{bundle} || @include) {
-    pod2usage(0);
+    pod2usage(-perldocopt => 'Color');
   }
 
   my $bundle = Virtualmin::Config->new(

debian/changelog

@@ -1,3 +1,11 @@
+virtualmin-config (6.0.20) stable; urgency=medium
+
+  * Minimal configs adds Dovecot, SASL, removes Fail2ban
+  * Fix Apache default file handling on Ubuntu 16.04 
+  * ProFTPd shouldn't require TlS
+
+ -- Joe Cooper <[email protected]>  Thu, 28 Sep 2017 00:41:40 -0500
+
 virtualmin-config (6.0.19) stable; urgency=medium
 
   * Fix ClamAV broken-by-default configuration (again)

dist.ini

@@ -1,5 +1,5 @@
 name    = Virtualmin-Config
-version = 6.0.19
+version = 6.0.20
 author  = Joe Cooper <[email protected]>
 license = GPL_3
 copyright_holder = Joe Cooper

lib/Virtualmin/Config/MiniLAMP.pm

@@ -17,19 +17,18 @@ sub plugins {
   # Modern system with firewalld?
   if (-x "/usr/bin/firewall-cmd" || -x "/bin/firewall-cmd") {
     return [
-      "Webmin",  "Apache",  "Bind",       "Net",
-      "Postfix", "MySQL",   "Firewalld",  "Procmail",
-      "ProFTPd", "Quotas",  "Shells",     "Status",
-      "Upgrade", "Usermin", "Virtualmin", "NTP",
-      "Fail2banFirewalld"
+      "Webmin", "Apache",    "Bind",     "Net",     "Postfix",
+      "MySQL",  "Firewalld", "Procmail", "ProFTPd", "Quotas",
+      "Shells", "Status",    "Upgrade",  "Usermin", "Virtualmin",
+      "NTP",    "Dovecot",   "SASL",
     ];
   }
   else {
     return [
       "Webmin", "Apache",   "Bind",     "Net",     "Postfix",
       "MySQL",  "Firewall", "Procmail", "ProFTPd", "Quotas",
       "Shells", "Status",   "Upgrade",  "Usermin", "Virtualmin",
-      "NTP",    "Fail2ban"
+      "NTP",    "Dovecot",  "SASL"
     ];
   }
 }

lib/Virtualmin/Config/MiniLEMP.pm

@@ -17,19 +17,18 @@ sub plugins {
   # Modern system with firewalld?
   if (-x "/usr/bin/firewall-cmd" || -x "/bin/firewall-cmd") {
     return [
-      "Webmin",  "Nginx",   "Bind",       "Net",
-      "Postfix", "MySQL",   "Firewalld",  "Procmail",
-      "ProFTPd", "Quotas",  "Shells",     "Status",
-      "Upgrade", "Usermin", "Virtualmin", "NTP",
-      "Fail2banFirewalld"
+      "Webmin", "Nginx",     "Bind",     "Net",     "Postfix",
+      "MySQL",  "Firewalld", "Procmail", "ProFTPd", "Quotas",
+      "Shells", "Status",    "Upgrade",  "Usermin", "Virtualmin",
+      "NTP",    "Dovecot",   "SASL"
     ];
   }
   else {
     return [
       "Webmin", "Nginx",    "Bind",     "Net",     "Postfix",
       "MySQL",  "Firewall", "Procmail", "ProFTPd", "Quotas",
       "Shells", "Status",   "Upgrade",  "Usermin", "Virtualmin",
-      "NTP",    "Fail2ban"
+      "NTP",    "Dovecot",  "SASL"
     ];
   }
 }

lib/Virtualmin/Config/Plugin/Apache.pm

@@ -77,7 +77,9 @@ sub actions {
         my $fn             = "/etc/default/apache2";
         my $apache2default = read_file_lines($fn) or die "Failed to open $fn!";
         my $idx            = indexof("NO_START=1");
-        $apache2default->[$idx] = "NO_START=0";
+        if ($idx) {
+          $apache2default->[$idx] = "NO_START=0";
+        }
         flush_file_lines($fn);
       }
     }

lib/Virtualmin/Config/Plugin/ProFTPd.pm

@@ -106,7 +106,7 @@ DefaultRoot ~
 # Enable TLS
 LoadModule mod_tls.c
 TLSEngine                     on
-TLSRequired                   on
+TLSRequired                   off
 TLSRSACertificateFile         $certfile
 TLSRSACertificateKeyFile      $keyfile
 TLSOptions                    NoCertRequest

virtualmin-config.spec

@@ -1,5 +1,5 @@
 Name:           virtualmin-config
-Version:        6.0.19
+Version:        6.0.20
 Release:        1
 Summary:        Collection of plugins to initialize the configuration of services that Virtualmin manages, and a command line tool called init-system to run them
 License:        GPL+
@@ -67,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/libexec/webmin/virtual-server/config-system.pl
 
 %changelog
+* Thu Sep 28 2017 Joe Cooper <[email protected]> 6.0.20-1
+- Minimal configs adds Dovecot, SASL, removes Fail2ban
+- Fix Apache default file handling on Ubuntu 16.04
+- ProFTPd shouldn't require TlS
 * Mon Sep 04 2017 Joe Cooper <[email protected]> 6.0.16-1
 - Fix ProFTPd failure to write config changes
 * Fri Sep 01 2017 Joe Cooper <[email protected]> 6.0.15-1