Skip to content

Commit b45b505

Browse files
author
Kevin Conway
authored
web: always install acme.sh when container starts
The previous version only installed acme.sh if it was not previously installed. However, the check for a previous installation was based on the existence of /config/acme.sh/acme.sh which is in the external/persisted storage. The result was that acme.sh installation would be skipped even for a new build of the web container if the installation had been run on any previous build of the container. When the web container is rebuilt, such as during an upgrade to a new stable version, the new container would lack the cron job needed to automatically updated the TLS certificates. Additionally, the version of acme.sh installed in /config/acme.sh would never update even if the pinned version in the Dockerfile was changed. This patch sets the init script to always re-install acme.sh on container start. The cron job installation from acme.sh is guarded by a check for an existing job so there is no duplication. Re-installing also has the effect of replacing the persisted /config/acme.sh/acme.sh with the latest version set in the Dockerfile during upgrades.
1 parent 94ca16d commit b45b505

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

web/rootfs/etc/cont-init.d/10-config

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ mkdir -p \
1010
# generate keys (maybe)
1111
if [[ $DISABLE_HTTPS -ne 1 ]]; then
1212
if [[ $ENABLE_LETSENCRYPT -eq 1 ]]; then
13-
if [[ ! -f /config/acme.sh/acme.sh ]]; then
14-
mkdir /config/acme.sh
15-
pushd /opt
16-
sh ./acme.sh --install --home /config/acme.sh --accountemail $LETSENCRYPT_EMAIL
17-
popd
18-
fi
13+
mkdir -p /config/acme.sh
14+
pushd /opt
15+
sh ./acme.sh --install --home /config/acme.sh --accountemail $LETSENCRYPT_EMAIL
16+
popd
1917
if [[ ! -f /config/acme-certs/$LETSENCRYPT_DOMAIN/fullchain.pem ]]; then
2018
STAGING=""
2119
if [[ $LETSENCRYPT_USE_STAGING -eq 1 ]]; then

0 commit comments

Comments
 (0)