From 16e8609017781a9353a4befefe650d9f361f3d69 Mon Sep 17 00:00:00 2001
From: Joe Cooper <swelljoe@gmail.com>
Date: Sat, 16 Sep 2017 15:03:07 -0500
Subject: [PATCH] Remove php from minimal installs, make sure it's in the full
 installs

---
 virtualmin-centos-6-comps.xml  | 3 +--
 virtualmin-centos-7-comps.xml  | 2 --
 virtualmin-fedora-25-comps.xml | 2 --
 virtualmin-fedora-26-comps.xml | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
index 802f6aa..dd29e07 100644
--- a/virtualmin-centos-6-comps.xml
+++ b/virtualmin-centos-6-comps.xml
@@ -74,6 +74,7 @@
       <packagereq type="default">mysql-devel</packagereq>
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
+      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -143,7 +144,6 @@
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-mbstring</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -280,7 +280,6 @@
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">php</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 6902cc3..907a534 100644
--- a/virtualmin-centos-7-comps.xml
+++ b/virtualmin-centos-7-comps.xml
@@ -234,7 +234,6 @@
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -308,7 +307,6 @@
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
       <packagereq type="default">perl-Config-IniFiles</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
index 191592f..7845cab 100644
--- a/virtualmin-fedora-25-comps.xml
+++ b/virtualmin-fedora-25-comps.xml
@@ -56,7 +56,6 @@
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -129,7 +128,6 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
diff --git a/virtualmin-fedora-26-comps.xml b/virtualmin-fedora-26-comps.xml
index d879fdd..f8070fc 100644
--- a/virtualmin-fedora-26-comps.xml
+++ b/virtualmin-fedora-26-comps.xml
@@ -57,7 +57,6 @@
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">opendkim</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -131,7 +130,6 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">opendkim</packagereq>
-      <packagereq type="default">php</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>