solve conflicts with ubuntu 20 branch

This commit is contained in:
Rauno Moisto
2021-07-13 14:47:20 +03:00
parent 4cb46ea465
commit 03fe2df0a6
12 changed files with 68 additions and 70 deletions
+2 -2
View File
@@ -247,7 +247,7 @@ def perform_backup(full_backup):
if quit:
sys.exit(code)
service_command("php7.2-fpm", "stop", quit=True)
service_command("php7.4-fpm", "stop", quit=True)
service_command("postfix", "stop", quit=True)
service_command("dovecot", "stop", quit=True)
@@ -281,7 +281,7 @@ def perform_backup(full_backup):
# Start services again.
service_command("dovecot", "start", quit=False)
service_command("postfix", "start", quit=False)
service_command("php7.2-fpm", "start", quit=False)
service_command("php7.4-fpm", "start", quit=False)
# Remove old backups. This deletes all backup data no longer needed
# from more than 3 days ago.