From 196fadc6d32bd415393d8a7aa8cebae5061eee39 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 27 Aug 2023 18:33:53 -0400 Subject: [PATCH] fix: use correct path for openresty letsencrypt data Paths are plugin-specific, and the previous path used the plugin alias, not the actual plugin name. --- plugins/openresty-vhosts/install | 4 ++-- plugins/openresty-vhosts/internal-functions | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/openresty-vhosts/install b/plugins/openresty-vhosts/install index 643146b17..cc771c102 100755 --- a/plugins/openresty-vhosts/install +++ b/plugins/openresty-vhosts/install @@ -8,8 +8,8 @@ trigger-openresty-install() { declare desc="installs the openresty plugin" declare trigger="install" - mkdir -p "${DOKKU_LIB_ROOT}/data/openresty" "${DOKKU_LIB_ROOT}/data/openresty/.docker-letsencrypt" - chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/openresty" + mkdir -p "${DOKKU_LIB_ROOT}/data/openresty-vhosts" "${DOKKU_LIB_ROOT}/data/openresty-vhosts/.docker-letsencrypt" + chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/openresty-vhosts" fn-plugin-property-setup "openresty" } diff --git a/plugins/openresty-vhosts/internal-functions b/plugins/openresty-vhosts/internal-functions index 1249a531a..ce8538db1 100755 --- a/plugins/openresty-vhosts/internal-functions +++ b/plugins/openresty-vhosts/internal-functions @@ -201,7 +201,7 @@ fn-openresty-template-compose-file() { COMPOSE_TEMPLATE="$CUSTOM_COMPOSE_TEMPLATE" fi - local SIGIL_PARAMS=(OPENRESTY_DATA_DIR="${DOKKU_LIB_ROOT}/data/openresty/.docker-letsencrypt" + local SIGIL_PARAMS=(OPENRESTY_DATA_DIR="${DOKKU_LIB_ROOT}/data/openresty-vhosts/.docker-letsencrypt" OPENRESTY_IMAGE="$(fn-openresty-image)" OPENRESTY_LETSENCRYPT_EMAIL="$(fn-openresty-letsencrypt-email)" OPENRESTY_LETSENCRYPT_SERVER="$(fn-openresty-letsencrypt-server)")