From d8bdc25da1a1c6b045e25927a8dd4380464146a3 Mon Sep 17 00:00:00 2001 From: casjay Date: Thu, 12 Sep 2024 18:46:13 -0400 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/root/docker/setup/02-packages.sh rootfs/usr/local/etc/docker/init.d/99-nginx.sh --- rootfs/root/docker/setup/02-packages.sh | 2 +- rootfs/usr/local/etc/docker/init.d/99-nginx.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index 1c2e0c2..2159e10 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -27,7 +27,7 @@ exitCode=0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Predifined actions - +[ -d "/etc/nginx" ] && rm -Rf /etc/nginx/* # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Main script diff --git a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh index 450406e..1426c55 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh @@ -223,9 +223,6 @@ __update_conf_files() { # define actions [ -f "$LOG_DIR/error.log" ] || touch "$LOG_DIR/error.log" [ -f "$LOG_DIR/access.log" ] || touch "$LOG_DIR/access.log" - [ -d "$WWW_ROOT_DIR/.well-known" ] || mkdir -p "$WWW_ROOT_DIR/.well-known" - mkdir -p "$ETC_DIR/conf.d" "$ETC_DIR/sites-enabled" "$ETC_DIR/sites-available" "$ETC_DIR/streams-enabled" "$ETC_DIR/streams-available" - mkdir -p "$CONF_DIR/conf.d" "$CONF_DIR/sites-enabled" "$CONF_DIR/sites-available" "$CONF_DIR/streams-enabled" "$CONF_DIR/streams-available" # exit function return $exitCode }