Skip to content

Commit f0203e9

Browse files
committed
Using new _rmrf executable
Try to certificates weekly not daily
1 parent 7eded8f commit f0203e9

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

overlay/etc/cont-init.d/21-ssl

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,9 @@ set -euo pipefail
1010
if [ "${CLEAN_INSTALL}" = "1" ] ; then
1111

1212
_echo "Clean install detected, cleaning ${SSL_CERTS} and ${SITES}..."
13-
14-
[[ -z "${SSL_GLOBAL_CFG}" ]] && _error "SSL_GLOBAL_CFG not defined."
15-
rm -rf ${SSL_GLOBAL_CFG}
16-
17-
[[ -z "${SSL_CERTS}" ]] && _error "SSL_CERTS not defined."
18-
rm -rf ${SSL_CERTS}/*
19-
20-
[[ -z "${SITES}" ]] && _error "SITES not defined."
21-
rm -rf ${SITES}/*
22-
13+
_rmrf ${SSL_GLOBAL_CFG}
14+
_rmrf ${SSL_CERTS}/*
15+
_rmrf ${SITES}/*
2316
_done
2417

2518
fi

overlay/usr/local/bin/nginx-regenerate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -euo pipefail
88
#======================================================================================================================
99

1010
_echo "Removing nginx configuration files..."
11-
[[ ! -z "${SITES}" ]] && rm ${SITES}/* || _error "SITES is not defined."
11+
_rmrf ${SITES}/*
1212
_done
1313

1414
ssl-init

overlay/usr/local/bin/ssl-regenerate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -euo pipefail
88
#======================================================================================================================
99

1010
_echo "Removing SSL configuration files and certificates..."
11-
[[ ! -z "${SSL_CERTS}" ]] && rm -rf ${SSL_CERTS}/* || _error "SSL_CERTS is not defined."
11+
_rmrf ${SSL_CERTS}/*
1212
_done
1313

1414
ssl-init

0 commit comments

Comments
 (0)