From e1ac2b0fdd7f7b1b9c81097ca9ef8effa8da3bb2 Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Sat, 26 Feb 2022 22:39:16 +0100 Subject: [PATCH 1/3] Backup Let's Encrypt certificates on update (#6281) --- install/update.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install/update.php b/install/update.php index 4639615801..6e64750342 100644 --- a/install/update.php +++ b/install/update.php @@ -216,6 +216,17 @@ if($do_backup == 'yes') { exec("tar pcfz $backup_path/etc.tar.gz /etc 2> /dev/null", $out, $returnvar); if($returnvar != 0) die("Backup failed. We stop here...\n"); + if (is_dir('/root/.acme.sh')) { + swriteln('Creating backup of "/root/.acme.sh" directory...'); + exec("tar pcfz $backup_path/acme.sh.tar.gz /root/.acme.sh 2> /dev/null", $out, $returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); + } elseif (is_dir('/etc/letsencrypt')) { + swriteln('Creating backup of "/etc/letsencrypt" directory...'); + exec("tar pcfz $backup_path/letsencrypt.tar.gz /etc/letsencrypt 2> /dev/null", $out, $returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); + } + + exec("chown root:root $backup_path/*.tar.gz"); exec("chmod 700 $backup_path/*.tar.gz"); } -- GitLab From ae0a481fd528ab01da142d0cb15db1f4e959a70a Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Mon, 28 Feb 2022 15:53:15 +0000 Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s) --- install/update.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/update.php b/install/update.php index 6e64750342..98c798f500 100644 --- a/install/update.php +++ b/install/update.php @@ -220,7 +220,9 @@ if($do_backup == 'yes') { swriteln('Creating backup of "/root/.acme.sh" directory...'); exec("tar pcfz $backup_path/acme.sh.tar.gz /root/.acme.sh 2> /dev/null", $out, $returnvar); if($returnvar != 0) die("Backup failed. We stop here...\n"); - } elseif (is_dir('/etc/letsencrypt')) { + } + + if (is_dir('/etc/letsencrypt')) { swriteln('Creating backup of "/etc/letsencrypt" directory...'); exec("tar pcfz $backup_path/letsencrypt.tar.gz /etc/letsencrypt 2> /dev/null", $out, $returnvar); if($returnvar != 0) die("Backup failed. We stop here...\n"); -- GitLab From 5ee1a8cc778e77f133f1aa97746511ee62ebaa31 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Mon, 28 Feb 2022 16:56:02 +0100 Subject: [PATCH 3/3] Fix whitespaces --- install/update.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/update.php b/install/update.php index 98c798f500..a93f8e5ba8 100644 --- a/install/update.php +++ b/install/update.php @@ -218,14 +218,14 @@ if($do_backup == 'yes') { if (is_dir('/root/.acme.sh')) { swriteln('Creating backup of "/root/.acme.sh" directory...'); - exec("tar pcfz $backup_path/acme.sh.tar.gz /root/.acme.sh 2> /dev/null", $out, $returnvar); - if($returnvar != 0) die("Backup failed. We stop here...\n"); + exec("tar pcfz $backup_path/acme.sh.tar.gz /root/.acme.sh 2> /dev/null", $out, $returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); } if (is_dir('/etc/letsencrypt')) { swriteln('Creating backup of "/etc/letsencrypt" directory...'); - exec("tar pcfz $backup_path/letsencrypt.tar.gz /etc/letsencrypt 2> /dev/null", $out, $returnvar); - if($returnvar != 0) die("Backup failed. We stop here...\n"); + exec("tar pcfz $backup_path/certbot.tar.gz /etc/letsencrypt 2> /dev/null", $out, $returnvar); + if($returnvar != 0) die("Backup failed. We stop here...\n"); } -- GitLab