From 5b7053f1f0f0510267912aada2634acdb1bef948 Mon Sep 17 00:00:00 2001
From: Manuel Ambauen <manuel.ambauen@mambits.ch>
Date: Thu, 17 Dec 2020 16:37:08 +0100
Subject: [PATCH] Fixed problem with stopping php8.0-fpm on installation when
 installer tries to stop php8.0-fpm based on /etc/php/

---
 autoinstaller/Packages/debian-buster.xml  | 36 +++++++++++++++++++++++
 autoinstaller/Packages/debian-stretch.xml | 36 +++++++++++++++++++++++
 autoinstaller/Packages/devuan-ascii.xml   | 36 +++++++++++++++++++++++
 autoinstaller/Packages/ubuntu-bionic.xml  | 36 +++++++++++++++++++++++
 autoinstaller/Packages/ubuntu-xenial.xml  | 36 +++++++++++++++++++++++
 5 files changed, 180 insertions(+)

diff --git a/autoinstaller/Packages/debian-buster.xml b/autoinstaller/Packages/debian-buster.xml
index 371eb102cf..7c21eff246 100644
--- a/autoinstaller/Packages/debian-buster.xml
+++ b/autoinstaller/Packages/debian-buster.xml
@@ -323,6 +323,42 @@
             <package>php7.4-zip</package>
             <package>libapache2-mod-php7.4</package>
         </php7.4>
+        <php8.0
+                always_installed="1"
+                class="Servers::php"
+                description="PHP 8.0"
+        >
+            <package
+                    post_install_tasks="
+                        /usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
+                        gettext iconv pdo phar posix sockets bcmath bz2 curl gd
+                        gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
+                        opcache pspell dom xml xmlreader xmlwriter zip apcu
+                        apcu_bc
+                    "
+            >
+                php8.0
+            </package>
+            <package>php8.0-cli</package>
+            <package>php8.0-cgi</package>
+            <package>php8.0-fpm</package>
+            <package>php8.0-common</package>
+            <package>php8.0-bcmath</package>
+            <package>php8.0-bz2</package>
+            <package>php8.0-curl</package>
+            <package>php8.0-gd</package>
+            <package>php8.0-gmp</package>
+            <package>php8.0-imap</package>
+            <package>php8.0-intl</package>
+            <package>php8.0-mbstring</package>
+            <package>php8.0-mysql</package>
+            <package>php8.0-opcache</package>
+            <package>php8.0-phar</package>
+            <package>php8.0-pspell</package>
+            <package>php8.0-xml</package>
+            <package>php8.0-zip</package>
+            <package>libapache2-mod-php8.0</package>
+        </php8.0>
         <package>php-apcu</package>
         <package>php-apcu-bc</package>
         <package>php-pear</package>
diff --git a/autoinstaller/Packages/debian-stretch.xml b/autoinstaller/Packages/debian-stretch.xml
index 2d396324c1..ad6b42a13f 100644
--- a/autoinstaller/Packages/debian-stretch.xml
+++ b/autoinstaller/Packages/debian-stretch.xml
@@ -330,6 +330,42 @@
             <package>php7.4-zip</package>
             <package>libapache2-mod-php7.4</package>
         </php7.4>
+        <php8.0
+                always_installed="1"
+                class="Servers::php"
+                description="PHP 8.0"
+        >
+            <package
+                    post_install_tasks="
+                        /usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
+                        gettext iconv pdo phar posix sockets bcmath bz2 curl gd
+                        gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
+                        opcache pspell dom xml xmlreader xmlwriter zip apcu
+                        apcu_bc
+                    "
+            >
+                php8.0
+            </package>
+            <package>php8.0-cli</package>
+            <package>php8.0-cgi</package>
+            <package>php8.0-fpm</package>
+            <package>php8.0-common</package>
+            <package>php8.0-bcmath</package>
+            <package>php8.0-bz2</package>
+            <package>php8.0-curl</package>
+            <package>php8.0-gd</package>
+            <package>php8.0-gmp</package>
+            <package>php8.0-imap</package>
+            <package>php8.0-intl</package>
+            <package>php8.0-mbstring</package>
+            <package>php8.0-mysql</package>
+            <package>php8.0-opcache</package>
+            <package>php8.0-phar</package>
+            <package>php8.0-pspell</package>
+            <package>php8.0-xml</package>
+            <package>php8.0-zip</package>
+            <package>libapache2-mod-php8.0</package>
+        </php8.0>
         <package>php-apcu</package>
         <package>php-apcu-bc</package>
         <package>php-pear</package>
diff --git a/autoinstaller/Packages/devuan-ascii.xml b/autoinstaller/Packages/devuan-ascii.xml
index 31265832f4..3dbb5f7e41 100644
--- a/autoinstaller/Packages/devuan-ascii.xml
+++ b/autoinstaller/Packages/devuan-ascii.xml
@@ -323,6 +323,42 @@
             <package>php7.4-zip</package>
             <package>libapache2-mod-php7.4</package>
         </php7.4>
+        <php8.0
+                always_installed="1"
+                class="Servers::php"
+                description="PHP 8.0"
+        >
+            <package
+                    post_install_tasks="
+                        /usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
+                        gettext iconv pdo phar posix sockets bcmath bz2 curl gd
+                        gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
+                        opcache pspell dom xml xmlreader xmlwriter zip apcu
+                        apcu_bc
+                    "
+            >
+                php8.0
+            </package>
+            <package>php8.0-cli</package>
+            <package>php8.0-cgi</package>
+            <package>php8.0-fpm</package>
+            <package>php8.0-common</package>
+            <package>php8.0-bcmath</package>
+            <package>php8.0-bz2</package>
+            <package>php8.0-curl</package>
+            <package>php8.0-gd</package>
+            <package>php8.0-gmp</package>
+            <package>php8.0-imap</package>
+            <package>php8.0-intl</package>
+            <package>php8.0-mbstring</package>
+            <package>php8.0-mysql</package>
+            <package>php8.0-opcache</package>
+            <package>php8.0-phar</package>
+            <package>php8.0-pspell</package>
+            <package>php8.0-xml</package>
+            <package>php8.0-zip</package>
+            <package>libapache2-mod-php8.0</package>
+        </php8.0>
         <package>php-apcu</package>
         <package>php-apcu-bc</package>
         <package>php-pear</package>
diff --git a/autoinstaller/Packages/ubuntu-bionic.xml b/autoinstaller/Packages/ubuntu-bionic.xml
index d4768bb837..d68966fa6d 100644
--- a/autoinstaller/Packages/ubuntu-bionic.xml
+++ b/autoinstaller/Packages/ubuntu-bionic.xml
@@ -325,6 +325,42 @@
             <package>php7.4-zip</package>
             <package>libapache2-mod-php7.4</package>
         </php7.4>
+        <php8.0
+                always_installed="1"
+                class="Servers::php"
+                description="PHP 8.0"
+        >
+            <package
+                    post_install_tasks="
+                        /usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
+                        gettext iconv pdo phar posix sockets bcmath bz2 curl gd
+                        gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
+                        opcache pspell dom xml xmlreader xmlwriter zip apcu
+                        apcu_bc
+                    "
+            >
+                php8.0
+            </package>
+            <package>php8.0-cli</package>
+            <package>php8.0-cgi</package>
+            <package>php8.0-fpm</package>
+            <package>php8.0-common</package>
+            <package>php8.0-bcmath</package>
+            <package>php8.0-bz2</package>
+            <package>php8.0-curl</package>
+            <package>php8.0-gd</package>
+            <package>php8.0-gmp</package>
+            <package>php8.0-imap</package>
+            <package>php8.0-intl</package>
+            <package>php8.0-mbstring</package>
+            <package>php8.0-mysql</package>
+            <package>php8.0-opcache</package>
+            <package>php8.0-phar</package>
+            <package>php8.0-pspell</package>
+            <package>php8.0-xml</package>
+            <package>php8.0-zip</package>
+            <package>libapache2-mod-php8.0</package>
+        </php8.0>
         <package>php-apcu</package>
         <package>php-apcu-bc</package>
         <package>php-pear</package>
diff --git a/autoinstaller/Packages/ubuntu-xenial.xml b/autoinstaller/Packages/ubuntu-xenial.xml
index 9e652ad45c..a6279e154d 100644
--- a/autoinstaller/Packages/ubuntu-xenial.xml
+++ b/autoinstaller/Packages/ubuntu-xenial.xml
@@ -325,6 +325,42 @@
             <package>php7.4-zip</package>
             <package>libapache2-mod-php7.4</package>
         </php7.4>
+        <php8.0
+                always_installed="1"
+                class="Servers::php"
+                description="PHP 8.0"
+        >
+            <package
+                    post_install_tasks="
+                        /usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
+                        gettext iconv pdo phar posix sockets bcmath bz2 curl gd
+                        gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
+                        opcache pspell dom xml xmlreader xmlwriter zip apcu
+                        apcu_bc
+                    "
+            >
+                php8.0
+            </package>
+            <package>php8.0-cli</package>
+            <package>php8.0-cgi</package>
+            <package>php8.0-fpm</package>
+            <package>php8.0-common</package>
+            <package>php8.0-bcmath</package>
+            <package>php8.0-bz2</package>
+            <package>php8.0-curl</package>
+            <package>php8.0-gd</package>
+            <package>php8.0-gmp</package>
+            <package>php8.0-imap</package>
+            <package>php8.0-intl</package>
+            <package>php8.0-mbstring</package>
+            <package>php8.0-mysql</package>
+            <package>php8.0-opcache</package>
+            <package>php8.0-phar</package>
+            <package>php8.0-pspell</package>
+            <package>php8.0-xml</package>
+            <package>php8.0-zip</package>
+            <package>libapache2-mod-php8.0</package>
+        </php8.0>
         <package>php-apcu</package>
         <package>php-apcu-bc</package>
         <package>php-pear</package>