From 99e7c7070ea85ff3f53e699e86eefb262ce74a1f Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Thu, 28 Sep 2017 01:53:56 -0500
Subject: [PATCH] Remove fail2ban from minimal

---
 virtualmin-centos-6-comps.xml | 9 ++++-----
 virtualmin-centos-7-comps.xml | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index dd29e07..d132aaa 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -135,7 +135,7 @@
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">fail2ban</packagereq>
+      <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
@@ -153,7 +153,7 @@
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">dovecot</packagereq>
+      <packagereq type="optional">fail2ban</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
@@ -271,10 +271,9 @@
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">fail2ban</packagereq>
+      <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
-      <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">mysql</packagereq>
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
@@ -289,7 +288,7 @@
       <packagereq type="default">proftpd</packagereq>
       <packagereq type="default">spamassassin</packagereq>
       <packagereq type="optional">awstats</packagereq>
-      <packagereq type="optional">dovecot</packagereq>
+      <packagereq type="optional">fail2ban</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
index 907a534..889701e 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -143,8 +143,6 @@
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
-      <packagereq type="default">fail2ban-firewalld</packagereq>
-      <packagereq type="default">fail2ban-server</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
@@ -167,6 +165,8 @@
       <packagereq type="optional">clamav-scanner-systemd</packagereq>
       <packagereq type="optional">clamav-server</packagereq>
       <packagereq type="optional">clamav-server-systemd</packagereq>
+      <packagereq type="optional">fail2ban-firewalld</packagereq>
+      <packagereq type="optional">fail2ban-server</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -296,15 +296,12 @@
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
       <packagereq type="default">dovecot</packagereq>
-      <packagereq type="default">fail2ban-firewalld</packagereq>
-      <packagereq type="default">fail2ban-server</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">jailkit</packagereq>
       <packagereq type="default">logrotate</packagereq>
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
-      <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-opcache</packagereq>
@@ -319,6 +316,8 @@
       <packagereq type="optional">clamav-scanner-systemd</packagereq>
       <packagereq type="optional">clamav-server</packagereq>
       <packagereq type="optional">clamav-server-systemd</packagereq>
+      <packagereq type="optional">fail2ban-firewalld</packagereq>
+      <packagereq type="optional">fail2ban-server</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>