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

Merge pull request #6121 from dokku/openresty-missing-funcs

Browse Source 
Add missing error-log-path function to openresty plugin
This commit is contained in:
Jose Diaz-Gonzalez
2023-08-19 19:02:04 -04:00
committed by GitHub
parent f433e008e9 4450c82866
commit 5cbeb326d6
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/openresty-vhosts/docker-args-process-deploy
View File

@@ -100,12 +100,16 @@ trigger-openresty-vhosts-docker-args-process-deploy() {
value="$(fn-openresty-access-log-format "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.access-log-format=$value'"
value="$(fn-openresty-access-log-path "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.access-log-path=$value'"
value="$(fn-openresty-bind-address-ipv4 "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.bind-address-ipv4=$value'"
value="$(fn-openresty-bind-address-ipv6 "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.bind-address-ipv6=$value'"
value="$(fn-openresty-client-max-body-size "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.client-max-body-size=$value'"
value="$(fn-openresty-error-log-path "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.error-log-path=$value'"
value="$(fn-openresty-hsts-include-subdomains "$APP")"
[[ -n "$value" ]] && output="$output '--label=openresty.hsts-include-subdomains=$value'"
value="$(fn-openresty-hsts-max-age "$APP")"

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

@@ -47,6 +47,14 @@ fn-openresty-client-max-body-size() {
fn-plugin-property-get-default "openresty" "$APP" "client-max-body-size" ""
}
fn-openresty-error-log-path() {
declare desc="get the configured error log path"
declare APP="$1"
local OPENRESTY_LOG_ROOT="$(fn-openresty-log-root)"
fn-plugin-property-get-default "openresty" "$APP" "error-log-path" "${OPENRESTY_LOG_ROOT}/${APP}-error.log"
}
fn-openresty-get-http-includes-dir() {
declare desc="get any include dir if available"
declare APP="$1"
@@ -102,7 +110,7 @@ fn-openresty-letsencrypt-server() {
fn-openresty-log-root() {
declare desc="get the openresty log root"
local OPENRESTY_LOG_ROOT="/var/log/openresty"
local OPENRESTY_LOG_ROOT="/var/log/nginx"
echo "$OPENRESTY_LOG_ROOT"
}