Testing removal of MiniVirtualmin plugin

virtualmin · Sep 1, 2017 · 6f7c545 · 6f7c545
1 parent de02b7a
commit 6f7c545
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/lib/Virtualmin/Config/MiniLAMP.pm b/lib/Virtualmin/Config/MiniLAMP.pm
@@ -20,7 +20,7 @@ sub plugins {
       "Webmin",  "Apache",  "Bind",           "Net",
       "Postfix", "MySQL",   "Firewalld",      "Procmail",
       "ProFTPd", "Quotas",  "Shells",         "Status",
-      "Upgrade", "Usermin", "MiniVirtualmin", "NTP",
+      "Upgrade", "Usermin", "Virtualmin", "NTP",
       "Fail2banFirewalld"
     ];
   }

diff --git a/lib/Virtualmin/Config/MiniLEMP.pm b/lib/Virtualmin/Config/MiniLEMP.pm
@@ -20,7 +20,7 @@ sub plugins {
       "Webmin",  "Nginx",   "Bind",           "Net",
       "Postfix", "MySQL",   "Firewalld",      "Procmail",
       "ProFTPd", "Quotas",  "Shells",         "Status",
-      "Upgrade", "Usermin", "MiniVirtualmin", "NTP",
+      "Upgrade", "Usermin", "Virtualmin", "NTP",
       "Fail2banFirewalld"
     ];
   }

diff --git a/lib/Virtualmin/Config/Plugin/Virtualmin.pm b/lib/Virtualmin/Config/Plugin/Virtualmin.pm
@@ -35,20 +35,28 @@ sub actions {
   $self->spin();
   eval {
     my %vconfig = &foreign_config("virtual-server");
-    $vconfig{'mail_system'}      = 0;
-    $vconfig{'aliascopy'}        = 1;
-    $vconfig{'home_base'}        = "/home";
-    $vconfig{'spam'}             = 1;
-    $vconfig{'virus'}            = 1;
+    $vconfig{'mail_system'} = 0;
+    $vconfig{'aliascopy'}   = 1;
+    $vconfig{'home_base'}   = "/home";
+    if ($self->bundle() eq "MiniLEMP" || $self->bundle() eq "MiniLAMP") {
+      $vconfig{'spam'}  = 0;
+      $vconfig{'virus'} = 0;
+      $vconfig{'postgresql'}       = 0;
+    }
+    else {
+      $vconfig{'spam'}  = 1;
+      $vconfig{'virus'} = 1;
+      $vconfig{'postgresql'}       = 1;
+    }
     $vconfig{'ftp'}              = 2;
-    $vconfig{'postgresql'}       = 1;
     $vconfig{'logrotate'}        = 3;
     $vconfig{'default_procmail'} = 1;
     $vconfig{'bind_spfall'}      = 0;
     $vconfig{'bind_spf'}         = "yes";
     $vconfig{'spam_delivery'}    = "\$HOME/Maildir/.spam/";
     $vconfig{'bccs'}             = 1;
     $vconfig{'reseller_theme'}   = "authentic-theme";
+
     if ($self->bundle() eq "LEMP" || $self->bundle() eq "MiniLEMP") {
       $vconfig{'ssl'}                  = 0;
       $vconfig{'web'}                  = 0;