From 6cee029d15cc7fdbbc44a24b4099b22069514605 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Sun, 12 Apr 2020 00:56:55 +0100
Subject: [PATCH] Move php version to functions.sh

---
 setup/functions.sh | 2 ++
 setup/web.sh       | 2 --
 setup/webmail.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/functions.sh b/setup/functions.sh
index b36d14bc..cdf89bed 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -214,3 +214,5 @@ function git_clone {
 	mv $TMPPATH/$SUBDIR $TARGETPATH
 	rm -rf $TMPPATH
 }
+
+export PHP_VERSION="7.3" # Expected php version
diff --git a/setup/web.sh b/setup/web.sh
index 893dd25f..55db74c2 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -2,8 +2,6 @@
 # HTTP: Turn on a web server serving static files
 #################################################
 
-PHP_VERSION="7.3" # Expected php version
-
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 89ed1722..86120c25 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -198,4 +198,4 @@ chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
 
 # Enable PHP modules.
 phpenmod -v php mcrypt imap
-restart_service php7.2-fpm
+restart_service php$PHP_VERSION-fpm