From fd27a6beb5395ba53e8e7dfb7f4e1ea399f718fc Mon Sep 17 00:00:00 2001
From: Daniel Hansson <github@hanssonit.se>
Date: Sun, 19 Jul 2020 21:33:53 +0200
Subject: [PATCH] add PHP_MODS_DIR (#1326)

---
 lib.sh                          |  1 +
 nextcloud_install_production.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib.sh b/lib.sh
index 7c7f672f..55fbcd5d 100644
--- a/lib.sh
+++ b/lib.sh
@@ -129,6 +129,7 @@ PHPVER=7.4
 PHP_FPM_DIR=/etc/php/$PHPVER/fpm
 PHP_INI=$PHP_FPM_DIR/php.ini
 PHP_POOL_DIR=$PHP_FPM_DIR/pool.d
+PHP_MODS_DIR=/etc/php/"$PHPVER"/mods-available
 # Adminer
 ADMINERDIR=/usr/share/adminer
 ADMINER_CONF=/etc/apache2/conf-available/adminer.conf
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index a43920d6..8a83c37a 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -479,14 +479,14 @@ run_script STATIC redis-server-ubuntu
  # php"$PHPVER"-smbclient does not yet work in PHP 7.4
  install_if_not libsmbclient-dev
  yes no | pecl install smbclient
- if [ ! -f /etc/php/"$PHPVER"/mods-available/smbclient.ini ]
+ if [ ! -f $PHP_MODS_DIR/smbclient.ini ]
  then
-     touch /etc/php/"$PHPVER"/mods-available/smbclient.ini
+     touch $PHP_MODS_DIR/smbclient.ini
  fi
- if ! grep -qFx extension=smbclient.so /etc/php/"$PHPVER"/mods-available/smbclient.ini
+ if ! grep -qFx extension=smbclient.so $PHP_MODS_DIR/smbclient.ini
  then
-     echo "# PECL smbclient" > /etc/php/"$PHPVER"/mods-available/smbclient.ini
-     echo "extension=smbclient.so" >> /etc/php/"$PHPVER"/mods-available/smbclient.ini
+     echo "# PECL smbclient" > $PHP_MODS_DIR/smbclient.ini
+     echo "extension=smbclient.so" >> $PHP_MODS_DIR/smbclient.ini
  fi
 
 # Enable igbinary for PHP