github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #6164 from dokku/openresty-correct-data-dir

Browse Source 
Use correct path for openresty letsencrypt data
This commit is contained in:
Jose Diaz-Gonzalez
2023-08-27 21:29:12 -04:00
committed by GitHub
parent d06ad01b57 196fadc6d3
commit fb5b605c4a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/openresty-vhosts/install
View File

@@ -8,8 +8,8 @@ trigger-openresty-install() {
declare desc="installs the openresty plugin" declare desc="installs the openresty plugin"
declare trigger="install" declare trigger="install"
mkdir -p "${DOKKU_LIB_ROOT}/data/openresty" "${DOKKU_LIB_ROOT}/data/openresty/.docker-letsencrypt" 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" chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/openresty-vhosts"
fn-plugin-property-setup "openresty" fn-plugin-property-setup "openresty"
} }

2
plugins/openresty-vhosts/internal-functions
View File

@@ -201,7 +201,7 @@ fn-openresty-template-compose-file() {
COMPOSE_TEMPLATE="$CUSTOM_COMPOSE_TEMPLATE" COMPOSE_TEMPLATE="$CUSTOM_COMPOSE_TEMPLATE"
fi 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_IMAGE="$(fn-openresty-image)"
OPENRESTY_LETSENCRYPT_EMAIL="$(fn-openresty-letsencrypt-email)" OPENRESTY_LETSENCRYPT_EMAIL="$(fn-openresty-letsencrypt-email)"
OPENRESTY_LETSENCRYPT_SERVER="$(fn-openresty-letsencrypt-server)") OPENRESTY_LETSENCRYPT_SERVER="$(fn-openresty-letsencrypt-server)")