From 4a85250242569ecddd31b0647798f96290d77f6d Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Wed, 8 Jul 2020 19:31:35 +0100
Subject: [PATCH 01/12] Revert vagrantfile to upstream config

---
 Vagrantfile | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2d6d3a0d..9e7ac462 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,12 +1,11 @@
+ 
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  # Recreate our conditions
-  config.vm.box = "generic/debian10"
-  config.vm.provider "hyperv" do |v|
-    v.memory = 1024
-    v.cpus = 1
+  config.vm.box = "debian/buster64"
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", 1, "--memory", 1024]
   end
 
   # Network config: Since it's a mail server, the machine must be connected
@@ -24,24 +23,9 @@ Vagrant.configure("2") do |config|
     export PUBLIC_IP=auto
     export PUBLIC_IPV6=auto
     export PRIMARY_HOSTNAME=auto
-    #export SKIP_NETWORK_CHECKS=1
-
-    if [ ! git ]
-    then
-      apt update
-      apt install git
-    fi
-
-    if [ ! -d /mailinabox ];
-    then
-      git clone https://github.com/ddavness/power-mailinabox.git /mailinabox
-    fi
-
+    export SKIP_NETWORK_CHECKS=1
     # Start the setup script.
-    cd /mailinabox
-    git checkout development
-    git pull
-
+    cd /vagrant
     setup/start.sh
 SH
-end
+end
\ No newline at end of file

From 199c2c50babd0b0822a86bee6f2ad06020fe185f Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Wed, 8 Jul 2020 19:32:24 +0100
Subject: [PATCH 02/12] Backups: Fix backup target selector width

---
 management/templates/system-backup.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index 3860edb7..81915fdc 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -12,7 +12,7 @@
 <form class="form-horizontal" role="form" onsubmit="set_custom_backup(); return false;">
   <div class="form-group">
     <label for="backup-target-type" class="col-sm-2 control-label">Backup to:</label>
-    <div class="col-sm-2">
+    <div class="col-sm-3">
       <select class="form-control" rows="1" id="backup-target-type" onchange="toggle_form()">
         <option value="off">Nowhere (Disable Backups)</option>
         <option value="local">{{hostname}}</option>

From af9ef186b3a0761efe0661254c54fe82dcb89887 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Fri, 10 Jul 2020 15:48:37 +0100
Subject: [PATCH 03/12] Add manual backup option

---
 management/backup.py                    | 26 ++++++++++++++++------
 management/daemon.py                    | 13 +++++++++++
 management/templates/system-backup.html | 29 +++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/management/backup.py b/management/backup.py
index 90a64588..cbc2ff5f 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -10,7 +10,7 @@
 import os, os.path, shutil, glob, re, datetime, sys
 import dateutil.parser, dateutil.relativedelta, dateutil.tz
 import rtyaml
-from exclusiveprocess import Lock
+from exclusiveprocess import Lock, CannotAcquireLock
 
 from utils import load_environment, shell, wait_for_service, fix_boto
 
@@ -20,7 +20,7 @@ rsync_ssh_options = [
 ]
 
 def backup_status(env):
-	# If backups are dissbled, return no status.
+	# If backups are disabled, return no status.
 	config = get_backup_config(env)
 	if config["target"] == "off":
 		return { }
@@ -210,13 +210,21 @@ def get_target_type(config):
 	protocol = config["target"].split(":")[0]
 	return protocol
 
-def perform_backup(full_backup):
+def perform_backup(full_backup, user_initiated=False):
 	env = load_environment()
 
 	# Create an global exclusive lock so that the backup script
 	# cannot be run more than one.
-	Lock(die=True).forever()
-
+	lock = Lock(die=(not user_initiated))
+	if user_initiated:
+		# God forgive me for what I'm about to do
+		try:
+			lock._acquire()
+		except CannotAcquireLock:
+			return "Another backup is already being done!"
+	else:
+		lock.forever()
+		
 	config = get_backup_config(env)
 	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
 	backup_cache_dir = os.path.join(backup_root, 'cache')
@@ -329,8 +337,12 @@ def perform_backup(full_backup):
 	# backup. Since it checks that dovecot and postfix are running, block for a
 	# bit (maximum of 10 seconds each) to give each a chance to finish restarting
 	# before the status checks might catch them down. See #381.
-	wait_for_service(25, True, env, 10)
-	wait_for_service(993, True, env, 10)
+	if user_initiated:
+		# God forgive me for what I'm about to do
+		lock._release() # We don't need to restart the services
+	else:
+		wait_for_service(25, True, env, 10)
+		wait_for_service(993, True, env, 10)
 
 def run_duplicity_verification():
 	env = load_environment()
diff --git a/management/daemon.py b/management/daemon.py
index 26c71661..2731bb19 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -509,6 +509,19 @@ def backup_set_custom():
 		request.form.get('min_age', '')
 	))
 
+@app.route('/system/backup/new', methods=["POST"])
+@authorized_personnel_only
+def backup_new():
+	from backup import perform_backup, get_backup_config
+
+	# If backups are disabled, don't perform the backup
+	config = get_backup_config(env)
+	if config["target"] == "off":
+		return "Backups are disabled in this machine. Nothing was done."
+
+	msg = perform_backup(request.form.get('full', False) == 'true', True)
+	return "OK" if msg is None else msg
+
 @app.route('/system/privacy', methods=["GET"])
 @authorized_personnel_only
 def privacy_status_get():
diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index 81915fdc..f24f48cd 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -140,6 +140,10 @@
   <tbody>
   </tbody>
 </table>
+
+<button id="create-full-backup-button" class="btn btn-primary" onclick="do_backup(true)">Create Full Backup Now</button>
+<button id="create-incremental-backup-button" class="btn btn-primary" onclick="do_backup(false)">Create Incremental Backup Now</button>
+
 <script>
 
 function toggle_form() {
@@ -303,4 +307,29 @@ function init_inputs(target_type) {
     set_host($('#backup-target-s3-host-select').val());
   }
 }
+
+function do_backup(is_full) {
+  let disclaimer = "The backup process will pause some services (such as PHP, Postfix and Dovecot). Depending on the size of the data this can take a while."
+  if (!is_full) {
+    disclaimer += "\nDepending on the amount of incremental backups done after the last full backup, the box may decide to do a full backup instead."
+  }
+  show_modal_confirm("Warning!", disclaimer, "Start Backup", () => {
+    api(
+    "/system/backup/new",
+    "POST",
+    {
+      full: is_full
+    },
+    function(r) {
+      // use .text() --- it's a text response, not html
+      show_modal_error("Backup configuration", $("<p/>").text(r), function() { if (r == "OK") show_system_backup(); }); // refresh after modal on success
+    },
+    function(r) {
+      // use .text() --- it's a text response, not html
+      show_modal_error("Backup configuration", $("<p/>").text(r));
+    });
+  return false;
+  })
+}
+
 </script>

From 79e2398d71762cbec404d8686e53fa4268853bad Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Sat, 11 Jul 2020 08:30:05 +0100
Subject: [PATCH 04/12] Fix comment

---
 management/backup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/management/backup.py b/management/backup.py
index cbc2ff5f..c9f7d80a 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -339,7 +339,8 @@ def perform_backup(full_backup, user_initiated=False):
 	# before the status checks might catch them down. See #381.
 	if user_initiated:
 		# God forgive me for what I'm about to do
-		lock._release() # We don't need to restart the services
+		lock._release()
+		# We don't need to wait for the services to be up in this case
 	else:
 		wait_for_service(25, True, env, 10)
 		wait_for_service(993, True, env, 10)

From ccf60c7017b738d94b15b8d74b8808b77e7d5f35 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Sat, 11 Jul 2020 09:16:32 +0100
Subject: [PATCH 05/12] Backups: User-initiated and cron-initiated jobs will
 have the same lockname

So that some poor timing (initiating a backup when there's a cron-initiated backup)
doesn't screw everything up.
---
 management/backup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/management/backup.py b/management/backup.py
index c9f7d80a..bfae23b3 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -215,7 +215,7 @@ def perform_backup(full_backup, user_initiated=False):
 
 	# Create an global exclusive lock so that the backup script
 	# cannot be run more than one.
-	lock = Lock(die=(not user_initiated))
+	lock = Lock(name="mailinabox_backup_daemon", die=(not user_initiated))
 	if user_initiated:
 		# God forgive me for what I'm about to do
 		try:

From b562e7eefac7994d00b3fbc00f57c4f23c981717 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Sat, 11 Jul 2020 15:45:50 +0100
Subject: [PATCH 06/12] Hide the 'Create Backup' buttons when backups are
 turned off

---
 management/templates/system-backup.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index f24f48cd..5d0e3487 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -141,8 +141,9 @@
   </tbody>
 </table>
 
-<button id="create-full-backup-button" class="btn btn-primary" onclick="do_backup(true)">Create Full Backup Now</button>
-<button id="create-incremental-backup-button" class="btn btn-primary" onclick="do_backup(false)">Create Incremental Backup Now</button>
+<!-- Hide these buttons until we're sure we can use them :) -->
+<button id="create-full-backup-button" class="btn btn-primary" onclick="do_backup(true)" style="display: none;">Create Full Backup Now</button>
+<button id="create-incremental-backup-button" class="btn btn-primary" onclick="do_backup(false)" style="display: none;">Create Incremental Backup Now</button>
 
 <script>
 
@@ -190,10 +191,14 @@ function show_system_backup() {
       if (typeof r.backups == "undefined") {
         var tr = $('<tr><td colspan="3">Backups are turned off.</td></tr>');
         $('#backup-status tbody').append(tr);
+        $('#create-full-backup-button').css("display","none")
+        $('#create-incremental-backup-button').css("display","none")
         return;
       } else if (r.backups.length == 0) {
         var tr = $('<tr><td colspan="3">No backups have been made yet.</td></tr>');
         $('#backup-status tbody').append(tr);
+        $('#create-full-backup-button').css("display","unset")
+        $('#create-incremental-backup-button').css("display","unset")
       }
 
       for (var i = 0; i < r.backups.length; i++) {

From 515a74ba11cdab5107b88e8849f721657ee38d0a Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Tue, 14 Jul 2020 11:51:25 +0100
Subject: [PATCH 07/12] Render the lsb_release at flask init time

Don't change the index.html file at setup time
---
 management/daemon.py            | 3 +++
 management/templates/index.html | 2 +-
 setup/preflight.sh              | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/management/daemon.py b/management/daemon.py
index 2731bb19..17763039 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -101,9 +101,12 @@ def index():
 	utils.fix_boto() # must call prior to importing boto
 	import boto.s3
 	backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()]
+	lsb=utils.shell("check_output", ["/usr/bin/lsb_release", "-d"])
 
 	return render_template('index.html',
 		hostname=env['PRIMARY_HOSTNAME'],
+		distname=lsb[lsb.find("\t")+1:-1],
+		
 		storage_root=env['STORAGE_ROOT'],
 
 		no_users_exist=no_users_exist,
diff --git a/management/templates/index.html b/management/templates/index.html
index f4fa9a52..82e929e0 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -180,7 +180,7 @@
 		<hr>
 
 		<footer>
-			<p>This is a <a href="https://github.com/ddavness/power-mailinabox">Power Mail-in-a-Box</a>, using !!___DIST_TAG___!!
+			<p>This is a <a href="https://github.com/ddavness/power-mailinabox">Power Mail-in-a-Box</a> - {{distname}}
 			</p>
 		</footer>
 	</div> <!-- /container -->
diff --git a/setup/preflight.sh b/setup/preflight.sh
index 785ec72d..51952693 100644
--- a/setup/preflight.sh
+++ b/setup/preflight.sh
@@ -18,8 +18,6 @@ if [ "$OS" != "Debian GNU/Linux 10 (buster)" -a "$OS" != "Ubuntu 20.04 LTS" ]; t
 	exit 1
 fi
 
-sed -i "s|!!___DIST_TAG___!!|${OS}|g" management/templates/index.html
-
 # Check that we have enough memory.
 #
 # /proc/meminfo reports free memory in kibibytes. Our baseline will be 512 MB,

From c8fbe2dd5df9f7e9318472b2646b26df3716ecd5 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Wed, 15 Jul 2020 15:28:02 +0100
Subject: [PATCH 08/12] Determine the PHP version at runtime (instead of at
 setup-time)

---
 conf/nginx-top.conf      |  3 +--
 management/backup.py     |  7 ++++---
 management/utils.py      |  3 +++
 management/web_update.py |  3 ++-
 setup/functions.sh       | 14 +++-----------
 setup/nextcloud.sh       | 12 ++++++------
 setup/web.sh             | 16 ++++++++--------
 setup/webmail.sh         |  2 +-
 setup/zpush.sh           |  2 +-
 9 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/conf/nginx-top.conf b/conf/nginx-top.conf
index a4d09292..85d056cf 100644
--- a/conf/nginx-top.conf
+++ b/conf/nginx-top.conf
@@ -7,6 +7,5 @@
 ##       your own --- please do not ask for help from us.
 
 upstream php-fpm {
-	server unix:/var/run/php/php!!___PHPVER___!!-fpm.sock;
+	server unix:/var/run/php/php{{phpver}}-fpm.sock;
 }
-
diff --git a/management/backup.py b/management/backup.py
index bfae23b3..ce53353c 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -12,7 +12,7 @@ import dateutil.parser, dateutil.relativedelta, dateutil.tz
 import rtyaml
 from exclusiveprocess import Lock, CannotAcquireLock
 
-from utils import load_environment, shell, wait_for_service, fix_boto
+from utils import load_environment, shell, wait_for_service, fix_boto, get_php_version
 
 rsync_ssh_options = [
 	"--ssh-options= -i /root/.ssh/id_rsa_miab",
@@ -212,6 +212,7 @@ def get_target_type(config):
 
 def perform_backup(full_backup, user_initiated=False):
 	env = load_environment()
+	php_fpm = f"php{get_php_version()}-fpm"
 
 	# Create an global exclusive lock so that the backup script
 	# cannot be run more than one.
@@ -255,7 +256,7 @@ def perform_backup(full_backup, user_initiated=False):
 			if quit:
 				sys.exit(code)
 
-	service_command("php!!___PHPVER___!!-fpm", "stop", quit=True)
+	service_command(php_fpm, "stop", quit=True)
 	service_command("postfix", "stop", quit=True)
 	service_command("dovecot", "stop", quit=True)
 
@@ -289,7 +290,7 @@ def perform_backup(full_backup, user_initiated=False):
 		# Start services again.
 		service_command("dovecot", "start", quit=False)
 		service_command("postfix", "start", quit=False)
-		service_command("php!!___PHPVER___!!-fpm", "start", quit=False)
+		service_command(php_fpm, "start", quit=False)
 
 	# Remove old backups. This deletes all backup data no longer needed
 	# from more than 3 days ago.
diff --git a/management/utils.py b/management/utils.py
index f198286c..28e387f2 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -182,6 +182,9 @@ def fix_boto():
 	import os
 	os.environ["BOTO_CONFIG"] = "/etc/boto3.cfg"
 
+def get_php_version():
+	# Gets the version of PHP installed in the system.
+	return shell("check_output", ["/usr/bin/php", "-v"])[4:7]
 
 if __name__ == "__main__":
 	from web_update import get_web_domains
diff --git a/management/web_update.py b/management/web_update.py
index 67e2f07e..ba801d81 100644
--- a/management/web_update.py
+++ b/management/web_update.py
@@ -7,7 +7,7 @@ import os.path, re, rtyaml
 from mailconfig import get_mail_domains
 from dns_update import get_custom_dns_config, get_dns_zones
 from ssl_certificates import get_ssl_certificates, get_domain_ssl_files, check_certificate
-from utils import shell, safe_domain_name, sort_domains
+from utils import shell, safe_domain_name, sort_domains, get_php_version
 
 def get_web_domains(env, include_www_redirects=True, exclude_dns_elsewhere=True):
 	# What domains should we serve HTTP(S) for?
@@ -76,6 +76,7 @@ def do_web_update(env):
 
 	# Build an nginx configuration file.
 	nginx_conf = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-top.conf")).read()
+	nginx_conf = re.sub("{{phpver}}", get_php_version(), nginx_conf)
 
 	# Load the templates.
 	template0 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx.conf")).read()
diff --git a/setup/functions.sh b/setup/functions.sh
index 7097ad64..11530792 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -222,14 +222,6 @@ function git_clone {
 	rm -rf $TMPPATH
 }
 
-OS=`lsb_release -d | sed 's/.*:\s*//' `
-
-# Expected php version
-if [ "$OS" == "Debian GNU/Linux 10 (buster)" ]; then
-	export PHP_VERSION="7.3"
-elif [ "$OS" == "Ubuntu 20.04 LTS" ]; then
-	export PHP_VERSION="7.4"
-fi
-
-sed -i "s|!!___PHPVER___!!|${PHP_VERSION}|g" conf/nginx-top.conf
-sed -i "s|!!___PHPVER___!!|${PHP_VERSION}|g" management/backup.py
+function php_version {
+	php --version | head -n 1 | cut -d " " -f 2 | cut -c 1-3
+}
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index d424737b..1c9c91e7 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -112,7 +112,7 @@ fi
 if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextcloud_ver ]]; then
 
 	# Stop php-fpm if running. If theyre not running (which happens on a previously failed install), dont bail.
-	service php$PHP_VERSION-fpm stop &> /dev/null || /bin/true
+	service php$(php_version)-fpm stop &> /dev/null || /bin/true
 
 	# Backup the existing ownCloud/Nextcloud.
 	# Create a backup directory to store the current installation and database to
@@ -285,7 +285,7 @@ if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
 
 # Set PHP FPM values to support large file uploads
 # (semicolon is the comment character in this file, hashes produce deprecation warnings)
-management/editconf.py /etc/php/$PHP_VERSION/fpm/php.ini -c ';' \
+management/editconf.py /etc/php/$(php_version)/fpm/php.ini -c ';' \
 	upload_max_filesize=16G \
 	post_max_size=16G \
 	output_buffering=16384 \
@@ -294,7 +294,7 @@ management/editconf.py /etc/php/$PHP_VERSION/fpm/php.ini -c ';' \
 	short_open_tag=On
 
 # Set Nextcloud recommended opcache settings
-management/editconf.py /etc/php/$PHP_VERSION/cli/conf.d/10-opcache.ini -c ';' \
+management/editconf.py /etc/php/$(php_version)/cli/conf.d/10-opcache.ini -c ';' \
 	opcache.enable=1 \
 	opcache.enable_cli=1 \
 	opcache.interned_strings_buffer=8 \
@@ -304,8 +304,8 @@ management/editconf.py /etc/php/$PHP_VERSION/cli/conf.d/10-opcache.ini -c ';' \
 	opcache.revalidate_freq=1
 
 # If apc is explicitly disabled we need to enable it
-if grep -q apc.enabled=0 /etc/php/$PHP_VERSION/mods-available/apcu.ini; then
-	management/editconf.py /etc/php/$PHP_VERSION/mods-available/apcu.ini -c ';' \
+if grep -q apc.enabled=0 /etc/php/$(php_version)/mods-available/apcu.ini; then
+	management/editconf.py /etc/php/$(php_version)/mods-available/apcu.ini -c ';' \
 		apc.enabled=1
 fi
 
@@ -330,4 +330,4 @@ rm -f /etc/cron.hourly/mailinabox-owncloud
 # ```
 
 # Enable PHP modules and restart PHP.
-restart_service php$PHP_VERSION-fpm
+restart_service php$(php_version)-fpm
diff --git a/setup/web.sh b/setup/web.sh
index f8c20f76..9db39c1d 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -46,15 +46,15 @@ management/editconf.py /etc/nginx/nginx.conf -s \
 	ssl_protocols="TLSv1.2 TLSv1.3;"
 
 # Tell PHP not to expose its version number in the X-Powered-By header.
-management/editconf.py /etc/php/$PHP_VERSION/fpm/php.ini -c ';' \
+management/editconf.py /etc/php/$(php_version)/fpm/php.ini -c ';' \
 	expose_php=Off
 
 # Set PHPs default charset to UTF-8, since we use it. See #367.
-management/editconf.py /etc/php/$PHP_VERSION/fpm/php.ini -c ';' \
+management/editconf.py /etc/php/$(php_version)/fpm/php.ini -c ';' \
         default_charset="UTF-8"
 
 # Configure the path environment for php-fpm
-management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
+management/editconf.py /etc/php/$(php_version)/fpm/pool.d/www.conf -c ';' \
 	env[PATH]=/usr/local/bin:/usr/bin:/bin \
 
 # Configure php-fpm based on the amount of memory the machine has
@@ -64,7 +64,7 @@ management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
 TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}' || /bin/true)
 if [ $TOTAL_PHYSICAL_MEM -lt 1000000 ]
 then
-        management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
+        management/editconf.py /etc/php/$(php_version)/fpm/pool.d/www.conf -c ';' \
                 pm=ondemand \
                 pm.max_children=8 \
                 pm.start_servers=2 \
@@ -72,7 +72,7 @@ then
                 pm.max_spare_servers=3
 elif [ $TOTAL_PHYSICAL_MEM -lt 2000000 ]
 then
-        management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
+        management/editconf.py /etc/php/$(php_version)/fpm/pool.d/www.conf -c ';' \
                 pm=ondemand \
                 pm.max_children=16 \
                 pm.start_servers=4 \
@@ -80,14 +80,14 @@ then
                 pm.max_spare_servers=6
 elif [ $TOTAL_PHYSICAL_MEM -lt 3000000 ]
 then
-        management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
+        management/editconf.py /etc/php/$(php_version)/fpm/pool.d/www.conf -c ';' \
                 pm=dynamic \
                 pm.max_children=60 \
                 pm.start_servers=6 \
                 pm.min_spare_servers=3 \
                 pm.max_spare_servers=9
 else
-        management/editconf.py /etc/php/$PHP_VERSION/fpm/pool.d/www.conf -c ';' \
+        management/editconf.py /etc/php/$(php_version)/fpm/pool.d/www.conf -c ';' \
                 pm=dynamic \
                 pm.max_children=120 \
                 pm.start_servers=12 \
@@ -147,7 +147,7 @@ chown -R $STORAGE_USER $STORAGE_ROOT/www
 
 # Start services.
 restart_service nginx
-restart_service php$PHP_VERSION-fpm
+restart_service php$(php_version)-fpm
 
 # Open ports.
 ufw_allow http
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 28457b20..f4ae1ed5 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 php$PHP_VERSION-fpm
+restart_service php$(php_version)-fpm
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 44d958df..51460115 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -102,7 +102,7 @@ EOF
 
 # Restart service.
 
-restart_service php$PHP_VERSION-fpm
+restart_service php$(php_version)-fpm
 
 # Fix states after upgrade
 

From 20b4f26e42b0c8c06578bd7b14f903ad3df5cee0 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Wed, 15 Jul 2020 15:28:47 +0100
Subject: [PATCH 09/12] Use ubuntu/focal64 as main testbed

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9e7ac462..9d3b3c29 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/buster64"
+  config.vm.box = "ubuntu/focal64"
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--cpus", 1, "--memory", 1024]
   end

From a0da88834ceb9c577cefc60c3f77a3f29ccd9d1a Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Tue, 21 Jul 2020 19:21:46 +0100
Subject: [PATCH 10/12] Terminate the status checks process pool before exiting

---
 management/status_checks.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/management/status_checks.py b/management/status_checks.py
index b1a5c68b..2d0b2c14 100755
--- a/management/status_checks.py
+++ b/management/status_checks.py
@@ -1038,10 +1038,12 @@ if __name__ == "__main__":
 	if len(sys.argv) == 1:
 		pool = multiprocessing.pool.Pool(processes=10)
 		run_checks(False, env, ConsoleOutput(), pool)
+		pool.terminate()
 
 	elif sys.argv[1] == "--show-changes":
 		pool = multiprocessing.pool.Pool(processes=10)
 		run_and_output_changes(env, pool)
+		pool.terminate()
 
 	elif sys.argv[1] == "--check-primary-hostname":
 		# See if the primary hostname appears resolvable and has a signed certificate.

From 311e6c63e855f2fc756ced6d04c5bbb30abddcf4 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Tue, 21 Jul 2020 19:25:48 +0100
Subject: [PATCH 11/12] Render the 'Backup now' buttons even if there are
 already backups

---
 management/templates/system-backup.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index 5d0e3487..3e4fc202 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -197,10 +197,11 @@ function show_system_backup() {
       } else if (r.backups.length == 0) {
         var tr = $('<tr><td colspan="3">No backups have been made yet.</td></tr>');
         $('#backup-status tbody').append(tr);
-        $('#create-full-backup-button').css("display","unset")
-        $('#create-incremental-backup-button').css("display","unset")
       }
 
+      // Backups ARE enabled.
+      $('#create-full-backup-button').css("display","unset")
+      $('#create-incremental-backup-button').css("display","unset")
       for (var i = 0; i < r.backups.length; i++) {
         var b = r.backups[i];
         var tr = $('<tr/>');

From fc0bd12631324d930029f25a50a9acd3d7984159 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Wed, 22 Jul 2020 01:10:16 +0100
Subject: [PATCH 12/12] Acquire pools with the 'with' statement

---
 management/daemon.py        |  5 ++---
 management/status_checks.py | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/management/daemon.py b/management/daemon.py
index 17763039..cac8a134 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -443,9 +443,8 @@ def system_status():
 			self.items[-1]["extra"].append({ "text": message, "monospace": monospace })
 	output = WebOutput()
 	# Create a temporary pool of processes for the status checks
-	pool = multiprocessing.pool.Pool(processes=5)
-	run_checks(False, env, output, pool)
-	pool.terminate()
+	with multiprocessing.pool.Pool(processes=5) as pool:
+		run_checks(False, env, output, pool)
 	return json_response(output.items)
 
 @app.route('/system/updates')
diff --git a/management/status_checks.py b/management/status_checks.py
index 2d0b2c14..a44832fd 100755
--- a/management/status_checks.py
+++ b/management/status_checks.py
@@ -1036,14 +1036,12 @@ if __name__ == "__main__":
 	env = load_environment()
 
 	if len(sys.argv) == 1:
-		pool = multiprocessing.pool.Pool(processes=10)
-		run_checks(False, env, ConsoleOutput(), pool)
-		pool.terminate()
+		with multiprocessing.pool.Pool(processes=10) as pool:
+			run_checks(False, env, ConsoleOutput(), pool)
 
 	elif sys.argv[1] == "--show-changes":
-		pool = multiprocessing.pool.Pool(processes=10)
-		run_and_output_changes(env, pool)
-		pool.terminate()
+		with multiprocessing.pool.Pool(processes=10) as pool:
+			run_and_output_changes(env, pool)
 
 	elif sys.argv[1] == "--check-primary-hostname":
 		# See if the primary hostname appears resolvable and has a signed certificate.