feat: keep track of whether proxy implementation should be stopped or started

This commit is contained in:
Jose Diaz-Gonzalez committed 2022-11-29 01:38:36 -05:00
1 parent bde7b16a80
commit b97a5c0c00
3 files changed
+6

No files matched your search

+2
View File
@@ -131,6 +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"
rm -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.stopped" 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
@@ -148,6 +149,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"
touch "${DOKKU_LIB_ROOT}/data/caddy/caddy.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
+2
View File
@@ -115,6 +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"
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped" 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"
@@ -125,6 +126,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"
touch "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.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"
+2
View File
@@ -135,6 +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"
rm -f "${DOKKU_LIB_ROOT}/data/traefik/traefik.stopped" 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"
@@ -154,6 +155,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"
touch "${DOKKU_LIB_ROOT}/data/traefik/traefik.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"