From bbc0556267ca6e8ab39617e026419b6412e0bae8 Mon Sep 17 00:00:00 2001 From: Arjan H Date: Mon, 22 Sep 2025 21:13:31 +0200 Subject: [PATCH] Fix backup/restore of nginx ssl files (#194) --- backup | 2 +- restore | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/backup b/backup index 03e0348..6cc27f1 100755 --- a/backup +++ b/backup @@ -18,7 +18,7 @@ mkdir -p /opt/backup cd /opt/boulder docker compose exec bmysql mysqldump boulder_sa_integration >$TMPDIR/boulder_sa_integration.sql -cp -rp /etc/nginx/ssl $TMPDIR/nginx_ssl/ +cp -rp /etc/nginx/ssl/* $TMPDIR/nginx_ssl/ cp -rp /opt/labca/data $TMPDIR/ #cp -p /opt/labca/data/config.json $TMPDIR/ diff --git a/restore b/restore index bffd749..8d00563 100755 --- a/restore +++ b/restore @@ -18,7 +18,18 @@ cd /opt/boulder docker compose exec bmysql mysql boulder_sa_integration <$TMPDIR/boulder_sa_integration.sql if [ -d $TMPDIR/nginx_ssl ]; then - mv -f $TMPDIR/nginx_ssl/* /etc/nginx/ssl/ + if [ -d /etc/nginx/ssl ]; then + if [ $(ls -1 /etc/nginx/ssl/ | wc -l) -gt 0 ]; then + rm -rf /etc/nginx/ssl_BAK + mkdir /etc/nginx/ssl_BAK + mv /etc/nginx/ssl/* /etc/nginx/ssl_BAK/ + fi + fi + if [ -d $TMPDIR/nginx_ssl/ssl ]; then + mv -f $TMPDIR/nginx_ssl/ssl/* /etc/nginx/ssl/ + else + mv -f $TMPDIR/nginx_ssl/* /etc/nginx/ssl/ + fi else mv -f $TMPDIR/*key* $TMPDIR/*cert.pem $TMPDIR/*.csr /etc/nginx/ssl/ fi