Tweaks for minimal bundles

virtualmin · Aug 9, 2017 · aa94335 · aa94335
1 parent 8123654
commit aa94335
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/Virtualmin/Config/MiniLAMP.pm b/lib/Virtualmin/Config/MiniLAMP.pm
@@ -17,11 +17,11 @@ sub plugins {
   # Modern system with systemd?
   if (-x "/usr/bin/systemctl" || -x "/bin/systemctl") {
     return [
-      "Webmin",  "Apache",  "Bind",      "Net",
-      "Postfix", "MySQL",   "Firewalld", "Procmail",
-      "ProFTPd", "Quotas",  "Shells",    "Status",
-      "Upgrade", "Usermin", "Webalizer", "MiniVirtualmin",
-      "NTP",     "Fail2banFirewalld"
+      "Webmin",  "Apache",  "Bind",           "Net",
+      "Postfix", "MySQL",   "Firewalld",      "Procmail",
+      "ProFTPd", "Quotas",  "Shells",         "Status",
+      "Upgrade", "Usermin", "MiniVirtualmin", "NTP",
+      "Fail2banFirewalld"
     ];
   }
   else {

diff --git a/lib/Virtualmin/Config/MiniLEMP.pm b/lib/Virtualmin/Config/MiniLEMP.pm
@@ -17,11 +17,11 @@ sub plugins {
   # Modern system with systemd?
   if (-x "/usr/bin/systemctl" || -x "/bin/systemctl") {
     return [
-      "Webmin",  "Nginx",   "Bind",      "Net",
-      "Postfix", "MySQL",   "Firewalld", "Procmail",
-      "ProFTPd", "Quotas",  "Shells",    "Status",
-      "Upgrade", "Usermin", "Webalizer", "MiniVirtualmin",
-      "NTP",     "Fail2banFirewalld"
+      "Webmin",  "Nginx",   "Bind",           "Net",
+      "Postfix", "MySQL",   "Firewalld",      "Procmail",
+      "ProFTPd", "Quotas",  "Shells",         "Status",
+      "Upgrade", "Usermin", "MiniVirtualmin", "NTP",
+      "Fail2banFirewalld"
     ];
   }
   else {

diff --git a/lib/Virtualmin/Config/Plugin/MiniVirtualmin.pm b/lib/Virtualmin/Config/Plugin/MiniVirtualmin.pm
@@ -13,7 +13,8 @@ sub new {
 
   # inherit from Plugin
   my $self
-    = $class->SUPER::new(name => 'MiniVirtualmin', depends => ['Usermin'], %args);
+    = $class->SUPER::new(name => 'MiniVirtualmin', depends => ['Usermin'],
+    %args);
 
   return $self;
 }

diff --git a/t/01-plugins.t b/t/01-plugins.t
@@ -9,20 +9,23 @@ my $bundle = Virtualmin::Config->new(bundle => 'Dummy');
 my @plugins = $bundle->_gather_plugins();
 ok(
   map {
-    grep {/Test/} @{$_}
+    grep {/Test/}
+      @{$_}
   } @plugins
 );
 ok(
   map {
-    grep {/Test2/} @{$_}
+    grep {/Test2/}
+      @{$_}
   } @plugins
 );
 
 my $include = Virtualmin::Config->new(include => ['Test']);
 my @plugins2 = $include->_gather_plugins();
 ok(
   map {
-    grep {/^Test$/} @{$_}
+    grep {/^Test$/}
+      @{$_}
   } @plugins2
 );
 ok(scalar @plugins2 == 1);