refactor: use the properties system instead of the data dir for tracking whether a proxy should be stopped or started
This commit is contained in:
@@ -131,8 +131,7 @@ cmd-caddy-start() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
touch "${DOKKU_LIB_ROOT}/data/caddy/caddy.started"
|
fn-plugin-property-write "caddy" "--global" "proxy-status" "started"
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.stopped"
|
|
||||||
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy up -d --quiet-pull
|
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy up -d --quiet-pull
|
||||||
}
|
}
|
||||||
@@ -149,8 +148,7 @@ cmd-caddy-stop() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.started"
|
fn-plugin-property-write "caddy" "--global" "proxy-status" "stopped"
|
||||||
touch "${DOKKU_LIB_ROOT}/data/caddy/caddy.stopped"
|
|
||||||
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy down --remove-orphans
|
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy down --remove-orphans
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ trigger-caddy-pre-restore() {
|
|||||||
declare desc="pre-restore the caddy proxy"
|
declare desc="pre-restore the caddy proxy"
|
||||||
declare trigger="install"
|
declare trigger="install"
|
||||||
|
|
||||||
if [[ ! -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.started" ]]; then
|
if [[ "$(fn-plugin-property-get "caddy" "--global" "proxy-status")" == "stopped" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -115,8 +115,7 @@ cmd-nginx-start() {
|
|||||||
declare cmd="nginx:start"
|
declare cmd="nginx:start"
|
||||||
[[ "$1" == "$cmd" ]] && shift 1
|
[[ "$1" == "$cmd" ]] && shift 1
|
||||||
|
|
||||||
touch "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.started"
|
fn-plugin-property-write "nginx" "--global" "proxy-status" "started"
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped"
|
|
||||||
fn-nginx-vhosts-nginx-init-cmd "enable"
|
fn-nginx-vhosts-nginx-init-cmd "enable"
|
||||||
fn-nginx-vhosts-nginx-init-cmd "start"
|
fn-nginx-vhosts-nginx-init-cmd "start"
|
||||||
}
|
}
|
||||||
@@ -126,8 +125,7 @@ cmd-nginx-stop() {
|
|||||||
declare cmd="nginx:stop"
|
declare cmd="nginx:stop"
|
||||||
[[ "$1" == "$cmd" ]] && shift 1
|
[[ "$1" == "$cmd" ]] && shift 1
|
||||||
|
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.started"
|
fn-plugin-property-write "nginx" "--global" "proxy-status" "stopped"
|
||||||
touch "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped"
|
|
||||||
fn-nginx-vhosts-nginx-init-cmd "stop"
|
fn-nginx-vhosts-nginx-init-cmd "stop"
|
||||||
fn-nginx-vhosts-nginx-init-cmd "disable"
|
fn-nginx-vhosts-nginx-init-cmd "disable"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,10 +130,15 @@ trigger-nginx-vhosts-install() {
|
|||||||
fn-nginx-vhosts-migrate-env-vars
|
fn-nginx-vhosts-migrate-env-vars
|
||||||
fn-nginx-vhosts-migrate-nginx-conf-sigil
|
fn-nginx-vhosts-migrate-nginx-conf-sigil
|
||||||
|
|
||||||
|
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped" ]]; then
|
||||||
|
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped"
|
||||||
|
fn-plugin-property-write "nginx" "--global" "proxy-status" "stopped"
|
||||||
|
fi
|
||||||
|
|
||||||
# avoid failing runit init calls on install
|
# avoid failing runit init calls on install
|
||||||
# the runit binaries are not yet available during dockerfile building
|
# the runit binaries are not yet available during dockerfile building
|
||||||
# and therefore both these calls will fail
|
# and therefore both these calls will fail
|
||||||
if [[ ! -x /usr/bin/sv ]] && [[ ! -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped" ]]; then
|
if [[ ! -x /usr/bin/sv ]] && [[ "$(fn-plugin-property-get "nginx" "--global" "proxy-status")" != "stopped" ]]; then
|
||||||
fn-nginx-vhosts-nginx-init-cmd start || fn-nginx-vhosts-nginx-init-cmd reload
|
fn-nginx-vhosts-nginx-init-cmd start || fn-nginx-vhosts-nginx-init-cmd reload
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ trigger-nginx-pre-restore() {
|
|||||||
declare desc="pre-restore the nginx proxy"
|
declare desc="pre-restore the nginx proxy"
|
||||||
declare trigger="install"
|
declare trigger="install"
|
||||||
|
|
||||||
if [[ ! -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.started" ]]; then
|
if [[ "$(fn-plugin-property-get "nginx" "--global" "proxy-status")" == "stopped" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -135,8 +135,7 @@ cmd-traefik-start() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik.started"
|
fn-plugin-property-write "traefik" "--global" "proxy-status" "started"
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/traefik/traefik.stopped"
|
|
||||||
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
||||||
chmod 600 "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
chmod 600 "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
||||||
fn-traefik-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-traefik-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
@@ -155,8 +154,7 @@ cmd-traefik-stop() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/traefik/traefik.started"
|
fn-plugin-property-write "traefik" "--global" "proxy-status" "stopped"
|
||||||
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik.stopped"
|
|
||||||
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
||||||
chmod 600 "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
chmod 600 "${DOKKU_LIB_ROOT}/data/traefik/traefik-acme.json"
|
||||||
fn-traefik-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-traefik-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ trigger-traefik-pre-restore() {
|
|||||||
declare desc="pre-restore the traefik proxy"
|
declare desc="pre-restore the traefik proxy"
|
||||||
declare trigger="install"
|
declare trigger="install"
|
||||||
|
|
||||||
if [[ ! -f "${DOKKU_LIB_ROOT}/data/traefik/traefik.started" ]]; then
|
if [[ "$(fn-plugin-property-get "traefik" "--global" "proxy-status")" == "stopped" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user