Remove php from default install, as we don't want mod_php

virtualmin · Aug 22, 2017 · b7fc15c · b7fc15c
1 parent 96d595b
commit b7fc15c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/virtualmin-centos-6-comps.xml b/virtualmin-centos-6-comps.xml
@@ -10,7 +10,6 @@
     <description>Most commonly used PHP 7 packages from Software Collections</description>
     <packagelist>
       <packagereq type="mandatory">rh-php70</packagereq>
-      <packagereq type="mandatory">rh-php70-php</packagereq>
       <packagereq type="mandatory">rh-php70-php-fpm</packagereq>
       <packagereq type="default">rh-php70-php-bcmath</packagereq>
       <packagereq type="default">rh-php70-php-devel</packagereq>
@@ -50,7 +49,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -120,7 +119,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -185,7 +184,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -249,7 +248,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>

diff --git a/virtualmin-centos-7-comps.xml b/virtualmin-centos-7-comps.xml
@@ -10,7 +10,7 @@
     <description>Most commonly used PHP 7 packages from Software Collections</description>
     <packagelist>
       <packagereq type="mandatory">rh-php70</packagereq>
-      <packagereq type="mandatory">rh-php70-php</packagereq>
+      <packagereq type="mandatory">rh-php70-php-cli</packagereq>
       <packagereq type="mandatory">rh-php70-php-fpm</packagereq>
       <packagereq type="default">rh-php70-php-bcmath</packagereq>
       <packagereq type="default">rh-php70-php-devel</packagereq>
@@ -50,7 +50,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -124,7 +124,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -199,7 +199,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -270,7 +270,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>

diff --git a/virtualmin-fedora-25-comps.xml b/virtualmin-fedora-25-comps.xml
@@ -28,7 +28,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>
@@ -101,7 +101,7 @@
       <packagereq type="mandatory">perl-parent</packagereq>
       <packagereq type="mandatory">perl-Time-HiRes</packagereq>
       <packagereq type="mandatory">perl-XML-Simple</packagereq>
-      <packagereq type="mandatory">php</packagereq>
+      <packagereq type="mandatory">php-cli</packagereq>
       <packagereq type="mandatory">php-fpm</packagereq>
       <packagereq type="mandatory">php-gd</packagereq>
       <packagereq type="mandatory">php-imap</packagereq>