More Bionic related adjustements

debian-software

@@ -359,7 +359,6 @@ cat > ${TEMP_DIR}/isp.conf.php <<EOF
 <?php
 \$autoinstall['language'] = 'en'; // de, en (default)
 \$autoinstall['install_mode'] = 'standard'; // standard (default), expert
-
 \$autoinstall['hostname'] = '$HOSTNAMEFQDN'; // default
 \$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
 \$autoinstall['mysql_root_user'] = 'root'; // default: root
@@ -1177,7 +1176,7 @@ libapache2-mod-fastcgi php7.0-fpm letsencrypt"
 local pkg_bionic="apache2 apache2-doc apache2-utils libapache2-mod-php php7.2 php7.2-common php7.2-gd php7.2-mysql php7.2-imap \
 phpmyadmin php7.2-cli php7.2-cgi libapache2-mod-fcgid apache2-suexec-pristine php-pear mcrypt  imagemagick libruby libapache2-mod-python \
 php7.2-curl php7.2-intl php7.2-pspell php7.2-recode php7.2-sqlite3 php7.2-tidy php7.2-xmlrpc php7.2-xsl memcached php-memcache \
-php-imagick php-gettext php7.2-zip php7.2-mbstring php-soap php7.2-soap"
+php-imagick php-gettext php7.2-zip php7.2-mbstring php-soap php7.2-soap php7.2-fpm letsencrypt"
 
 local pkg_stretch="libapache2-mod-php php7.0 php7.0-common php7.0-gd php7.0-mysql php7.0-imap php7.0-cli php7.0-cgi libapache2-mod-fcgid \
 apache2-suexec-pristine php7.0-mcrypt libapache2-mod-python php7.0-curl php7.0-intl php7.0-pspell php7.0-recode php7.0-sqlite3 \
@@ -1200,7 +1199,21 @@ cat <<EOT > /etc/apache2/conf-available/httpoxy.conf
 EOT
 
 a2enmod actions proxy_fcgi setenvif fastcgi alias httpoxy suexec rewrite ssl actions include dav_fs dav auth_digest cgi headers >/dev/null 2>&1
-a2enconf php7.0-fpm >/dev/null 2>&1
+	case $distribution in
+	        jessie)
+			a2enconf php5-fpm >/dev/null 2>&1
+	                ;;
+	        xenial)
+			a2enconf php7.0-fpm >/dev/null 2>&1
+	                ;;
+	        stretc)
+			a2enconf php7.0-fpm >/dev/null 2>&1
+	                ;;
+	        bionic)
+			a2enconf php7.2-fpm >/dev/null 2>&1
+	                ;;
+	        esac
+	}
 service apache2 restart >> /dev/null
 }
 
@@ -1216,29 +1229,50 @@ local pkg="nginx php-pear memcached fcgiwrap"
 
 local pkg_xenial="php7.0-fpm php7.0-opcache php7.0-fpm php7.0 php7.0-common php7.0-gd php7.0-mysql php7.0-imap php7.0-cli php7.0-cgi \
 php7.0-mcrypt mcrypt imagemagick libruby php7.0-curl php7.0-intl php7.0-pspell php7.0-recode php7.0-sqlite3 php7.0-tidy \
-php7.0-xmlrpc php7.0-xsl php-memcache php-imagick php-gettext php7.0-zip php7.0-mbstring php-apcu"
+php7.0-xmlrpc php7.0-xsl php-memcache php-imagick php-gettext php7.0-zip php7.0-mbstring php-apcu letsencrypt"
 
 local pkg_stretch="php7.0-fpm php7.0-opcache php7.0-fpm php7.0 php7.0-common php7.0-gd php7.0-mysql php7.0-imap php7.0-cli php7.0-cgi \
 php7.0-mcrypt mcrypt imagemagick libruby php7.0-curl php7.0-intl php7.0-pspell php7.0-recode php7.0-sqlite3 php7.0-tidy \
-php7.0-xmlrpc php7.0-xsl php-memcache php-imagick php-gettext php7.0-zip php7.0-mbstring php-apcu"
+php7.0-xmlrpc php7.0-xsl php-memcache php-imagick php-gettext php7.0-zip php7.0-mbstring php-apcu letsencrypt"
 
 local pkg_jessie="php5-fpm php5-mysql php5-curl php5-gd php5-intl php5-imagick php5-imap php5-mcrypt php5-memcache \
 php5-memcached php5-pspell php5-recode php5-snmp php5-sqlite php5-tidy php5-xmlrpc php5-xsl php-apc"
 
+local pkg_bionic="php7.2-fpm php7.2-opcache php7.2-fpm php7.2 php7.2-common php7.2-gd php7.2-mysql php7.2-imap php7.2-cli php7.2-cgi \
+imagemagick libruby php7.2-curl php7.2-intl php7.2-pspell php7.2-recode php7.2-sqlite3 php7.2-tidy \
+php7.2-xmlrpc php7.2-xsl php-memcache php-imagick php-gettext php7.2-zip php7.2-mbstring php-apcu letsencrypt"
+
 local temp="pkg_${distribution}"
 install_packet "${pkg} ${!temp}" "Nginx for $family $distribution"
 
-phpenmod mcrypt mbstring
-
-if [[ -f /etc/php/7.0/fpm/php.ini ]]; then
+case $distribution in
+        jessie)
+		phpenmod mcrypt mbstring
+		debconf-apt-progress -- apt-get install -y python-certbot -t jessie-backports
+        	service php5-fpm reload >> /dev/null
+                ;;
+	xenial)
+		phpenmod mcrypt mbstring
 		tz=$(cat /etc/timezone | sed 's/\//\\\//g')
         	sed -i "s/^cgi.fix_pathinfo=.*/cgi.fix_pathinfo=0/" /etc/php/7.0/fpm/php.ini
         	sed -i "s/^date.timezone=.*/date.timezone=""$tz""/" /etc/php/7.0/fpm/php.ini
         	service php7.0-fpm reload >> /dev/null
-else
-	debconf-apt-progress -- apt-get install -y python-certbot -t jessie-backports
-	service php5-fpm reload >> /dev/null
-fi
+		;;
+	stretc)
+		tz=$(cat /etc/timezone | sed 's/\//\\\//g')
+	        sed -i "s/^cgi.fix_pathinfo=.*/cgi.fix_pathinfo=0/" /etc/php/7.0/fpm/php.ini
+        	sed -i "s/^date.timezone=.*/date.timezone=""$tz""/" /etc/php/7.0/fpm/php.ini
+        	service php7.0-fpm reload >> /dev/null
+		phpenmod mcrypt mbstring
+		;;
+	bionic)
+		tz=$(cat /etc/timezone | sed 's/\//\\\//g')
+	        sed -i "s/^cgi.fix_pathinfo=.*/cgi.fix_pathinfo=0/" /etc/php/7.2/fpm/php.ini
+        	sed -i "s/^date.timezone=.*/date.timezone=""$tz""/" /etc/php/7.2/fpm/php.ini
+        	service php7.2-fpm reload >> /dev/null
+		phpenmod mbstring
+		;;
+        esac
 }