From 21484c09a56fea7b4010e43e7eb3bd0bcd14e2c0 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 19 May 2020 22:09:28 +0200
Subject: [PATCH] [Nextcloud] add php version detection

---
 .install/nextcloud/install.sh               | 11 +++++------
 .install/nextcloud/templates/nextcloud.conf |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.install/nextcloud/install.sh b/.install/nextcloud/install.sh
index 621c163..0de7b48 100755
--- a/.install/nextcloud/install.sh
+++ b/.install/nextcloud/install.sh
@@ -47,9 +47,7 @@ fi
 ## Update system packages
 
 apt install -y lsb-release apt-transport-https ca-certificates
-#wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add -
-echo "deb https://packages.sury.org/php/ $OS main" | tee /etc/apt/sources.list.d/ondrej.list
+PHPVERSION=$(ps auxf | grep php-fpm | grep -v -E 'color=auto|grep' | head -n 1 |  grep -oP '(?<=\().*(?=\))' | awk -F '/' '{print $4}')
 apt update -y
 
 apt install nginx mariadb-server apt-transport-https curl gnupg2 git lsb-release ssl-cert ca-certificates apt-transport-https tree locate software-properties-common dirmngr screen htop net-tools zip unzip curl ffmpeg ghostscript libfile-fcntllock-perl -y
@@ -60,10 +58,10 @@ systemctl enable mariadb || (echo "Erreur quelque part ..." && exit 1)
 systemctl enable nginx || (echo "Erreur quelque part ..." && exit 1)
 
 echo "	=== Installing php ... ==="
-apt install php7.3 php7.3-fpm php7.3-xml php7.3-curl php7.3-gd php7.3 php7.3-cgi php7.3-cli php7.3-zip php7.3-mysql php7.3-mbstring php7.3-intl php7.3-json php7.3-bz2 php7.3-ldap php-apcu imagemagick php-imagick php-smbclient -y
+apt install php php-fpm php-xml php-curl php-gd php php-cgi php-cli php-zip php-mysql php-mbstring php-intl php-json php-bz2 php-ldap php-apcu imagemagick php-imagick php-smbclient -y
 
 echo "	=== Configuring php ... ==="
-[[ ! -e /etc/php/7.3/cli/php.ini.bak ]] && (bash configure_php.sh || (echo "Erreur quelque part ..." && exit 1)) || echo "PHP déjà configuré, skip"
+[[ ! -e /etc/php/$PHPVERSION/cli/php.ini.bak ]] && (bash configure_php.sh || (echo "Erreur quelque part ..." && exit 1)) || echo "PHP déjà configuré, skip"
 
 echo "	=== Configure MariaDB ==="
 configMariaManual() {
@@ -151,6 +149,7 @@ cp *optimization.conf /etc/nginx/
 sed -i "s/NC_DOMAIN/$nc_domain/" /etc/nginx/conf.d/nextcloud.conf
 sed -i "s/NC_PORT/$nc_port/" /etc/nginx/conf.d/nextcloud.conf
 sed -i "s/80 default_server;/81 default_server;/" /etc/nginx/sites-enabled/default
+sed -i "s/_PHPVERSION/$PHPVERSION/" /etc/nginx/conf.d/nextcloud.conf
 
 chmod u+x ../ssl.sh
 if [[ $isSSL == "false" ]]; then
@@ -173,7 +172,7 @@ alias occ='/opt/scripts/occ'
 sudo -u www-data php /var/www/nextcloud/occ background:cron
 
 echo "	=== Restarting services ... ==="
-service php7.3-fpm restart && service nginx restart && service mysql restart && service redis-server restart
+service php-fpm restart && service nginx restart && service mysql restart && service redis-server restart
 
 bash /opt/scripts/nc_optimize.sh
 
diff --git a/.install/nextcloud/templates/nextcloud.conf b/.install/nextcloud/templates/nextcloud.conf
index c2b2cc4..6aac158 100644
--- a/.install/nextcloud/templates/nextcloud.conf
+++ b/.install/nextcloud/templates/nextcloud.conf
@@ -1,5 +1,5 @@
 upstream php-handler {
-    server unix:/var/run/php/php7.3-fpm.sock;
+    server unix:/var/run/php/php_PHPVERSION-fpm.sock;
 }
 
 server {