From 7b7e4a6b8a31c3f857adc1a59212c60a46da9d55 Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 6 Jan 2025 15:58:30 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh --- rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh | 4 ++-- rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh index 4193303..8836939 100755 --- a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh @@ -253,10 +253,10 @@ PublishServerDescriptor 1 %include $CONF_DIR/conf.d/*.conf EOF + [ -f "$CONF_DIR/conf.d/default.conf" ] || touch "$CONF_DIR/conf.d/default.conf" else - exit 1 + unset EXEC_CMD_BIN EXEC_CMD_ARGS fi - [ -f "$CONF_DIR/conf.d/default.conf" ] || touch "$CONF_DIR/conf.d/default.conf" # allow custom functions if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi diff --git a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh index 497a3de..946b841 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh @@ -276,10 +276,10 @@ DirPortFrontPage /usr/share/tor/html/exit.html %include $CONF_DIR/conf.d/*.conf EOF + [ -f "$CONF_DIR/conf.d/default.conf" ] || touch "$CONF_DIR/conf.d/default.conf" else - exit 1 + unset EXEC_CMD_BIN EXEC_CMD_ARGS fi - [ -f "$CONF_DIR/conf.d/default.conf" ] || touch "$CONF_DIR/conf.d/default.conf" # allow custom functions if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi