From 0182186c69d9bfe22d080fba669795f612ebc39b Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Fri, 27 Oct 2017 00:52:16 -0500
Subject: [PATCH] Move virtualmin-awstats out of core, as it isn't needed in
 minimal bundles

---
 virtualmin-centos-6-comps.xml  | 10 ++++++----
 virtualmin-centos-7-comps.xml  | 10 ++++++----
 virtualmin-core-comps.xml      |  1 -
 virtualmin-fedora-25-comps.xml |  7 ++++---
 virtualmin-fedora-26-comps.xml |  7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index 5de0c32..c354a5e 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -77,6 +77,7 @@
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -89,9 +90,9 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
@@ -120,7 +121,6 @@
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
       <packagereq type="mandatory">perl-JSON-XS</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">perl-Log-Log4perl</packagereq>
       <packagereq type="mandatory">perl-LWP-Protocol-https</packagereq>
       <packagereq type="mandatory">perl-Module-Load</packagereq>
@@ -152,6 +152,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -197,7 +198,6 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
@@ -224,6 +224,7 @@
       <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -236,6 +237,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
@@ -273,7 +275,6 @@
       <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
       <packagereq type="mandatory">php-mysql</packagereq>
       <packagereq type="mandatory">php-pear</packagereq>
@@ -297,6 +298,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
index cca948a..f2cf680 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -43,7 +43,6 @@
       <packagereq type="mandatory">perl-Crypt-SSLeay</packagereq>
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">perl-JSON-XS</packagereq>
       <packagereq type="mandatory">perl-Log-Log4perl</packagereq>
       <packagereq type="mandatory">perl-LWP-Protocol-https</packagereq>
@@ -84,6 +83,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -96,6 +96,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
@@ -138,7 +139,6 @@
       <packagereq type="mandatory">php-mbstring</packagereq>
       <packagereq type="mandatory">php-mysql</packagereq>
       <packagereq type="mandatory">php-pear</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
@@ -160,6 +160,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -235,7 +236,6 @@
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">cyrus-sasl-plain</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">dovecot</packagereq>
       <packagereq type="default">fail2ban-firewalld</packagereq>
       <packagereq type="default">fail2ban-server</packagereq>
@@ -248,6 +248,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -260,6 +261,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
@@ -307,7 +309,6 @@
       <packagereq type="default">bind</packagereq>
       <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">bzip2</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
@@ -322,6 +323,7 @@
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
diff --git a/virtualmin-core-comps.xml b/virtualmin-core-comps.xml
index c70a738..908a25d 100644
--- a/virtualmin-core-comps.xml
+++ b/virtualmin-core-comps.xml
@@ -19,7 +19,6 @@
       <packagereq type="default">wbm-jailkit</packagereq>
       <packagereq type="default">wbm-php-pear</packagereq>
       <packagereq type="default">wbm-ruby-gems</packagereq>
-      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">wbm-virtualmin-dav</packagereq>
       <packagereq type="default">wbm-virtualmin-git</packagereq>
       <packagereq type="default">wbm-virtualmin-htpasswd</packagereq>
diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
index 0cded82..140b672 100644
--- a/virtualmin-fedora-25-comps.xml
+++ b/virtualmin-fedora-25-comps.xml
@@ -15,8 +15,6 @@
       <packagereq type="mandatory">httpd</packagereq>
       <packagereq type="mandatory">httpd-itk</packagereq>
       <packagereq type="mandatory">iptables</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
-
       <packagereq type="mandatory">mod_ssl</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
       <packagereq type="mandatory">perl-Config-IniFiles</packagereq>
@@ -61,6 +59,7 @@
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -72,6 +71,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
@@ -112,7 +112,6 @@
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
       <packagereq type="mandatory">php-mbstring</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="mandatory">php-mysql</packagereq>
       <packagereq type="mandatory">php-pear</packagereq>
       <packagereq type="mandatory">python</packagereq>
@@ -138,6 +137,7 @@
       <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -150,6 +150,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
diff --git a/virtualmin-fedora-26-comps.xml b/virtualmin-fedora-26-comps.xml
index 542d7f6..6901d08 100644
--- a/virtualmin-fedora-26-comps.xml
+++ b/virtualmin-fedora-26-comps.xml
@@ -26,8 +26,6 @@
       <packagereq type="mandatory">perl-LWP-Protocol-https</packagereq>
       <packagereq type="mandatory">perl-Module-Load</packagereq>
       <packagereq type="mandatory">perl-parent</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
-
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
       <packagereq type="mandatory">php-cli</packagereq>
@@ -62,6 +60,7 @@
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -73,6 +72,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
@@ -123,7 +123,6 @@
       <packagereq type="default">ca-certificates</packagereq>
       <packagereq type="default">clamav</packagereq>
       <packagereq type="default">clamav-scanner-systemd</packagereq>
-      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">clamav-server</packagereq>
       <packagereq type="default">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
@@ -140,6 +139,7 @@
       <packagereq type="default">milter-greylist</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">p7zip</packagereq>
+      <packagereq type="default">perl-IO-Tty</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -152,6 +152,7 @@
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="default">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
+      <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">webalizer</packagereq>
       <packagereq type="default">xz</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>