Tidy

virtualmin · Sep 1, 2017 · de02b7a · de02b7a
1 parent 0c14cbd
commit de02b7a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/lib/Virtualmin/Config/Plugin/Apache.pm b/lib/Virtualmin/Config/Plugin/Apache.pm
@@ -170,8 +170,8 @@ sub actions {
 
     # Remove default SSL VirtualHost on RH systems
     if (-r '/etc/httpd/conf.d/ssl.conf') {
-      my $file = '/etc/httpd/conf.d/ssl.conf';
-      my $lref = read_file_lines($file);
+      my $file                 = '/etc/httpd/conf.d/ssl.conf';
+      my $lref                 = read_file_lines($file);
       my $virtual_host_section = 0;
       foreach my $l (@$lref) {
         if ($l !~ /^\s*#/) {

diff --git a/lib/Virtualmin/Config/Plugin/MiniVirtualmin.pm b/lib/Virtualmin/Config/Plugin/MiniVirtualmin.pm
@@ -41,7 +41,6 @@ sub actions {
     $vconfig{'home_base'}        = "/home";
     $vconfig{'spam'}             = 0;
     $vconfig{'virus'}            = 0;
-    $vconfig{'ssl'}              = 2;
     $vconfig{'ftp'}              = 2;
     $vconfig{'postgresql'}       = 0;
     $vconfig{'logrotate'}        = 3;
@@ -51,6 +50,15 @@ sub actions {
     $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;
+      $vconfig{'avail_virtualmin-dav'} = '';
+      $vconfig{'backup_feature_ssl'}   = 0;
+    }
+    else {
+      $vconfig{'ssl'} = 2;
+    }
     if (!defined($vconfig{'plugins'})) {
       $vconfig{'plugins'}
         = 'virtualmin-dav virtualmin-awstats virtualmin-mailman virtualmin-htpasswd';

diff --git a/lib/Virtualmin/Config/Plugin/Virtualmin.pm b/lib/Virtualmin/Config/Plugin/Virtualmin.pm
@@ -40,7 +40,6 @@ sub actions {
     $vconfig{'home_base'}        = "/home";
     $vconfig{'spam'}             = 1;
     $vconfig{'virus'}            = 1;
-    $vconfig{'ssl'}              = 2;
     $vconfig{'ftp'}              = 2;
     $vconfig{'postgresql'}       = 1;
     $vconfig{'logrotate'}        = 3;
@@ -50,6 +49,15 @@ sub actions {
     $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;
+      $vconfig{'avail_virtualmin-dav'} = '';
+      $vconfig{'backup_feature_ssl'}   = 0;
+    }
+    else {
+      $vconfig{'ssl'} = 2;
+    }
     if (!defined($vconfig{'plugins'})) {
       $vconfig{'plugins'}
         = 'virtualmin-dav virtualmin-awstats virtualmin-mailman virtualmin-htpasswd';