From bcb8a1c6c3ec70e438d62d471f52c00e86a13b79 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 26 Nov 2021 21:59:46 +0000 Subject: [PATCH] Fiddle with ufw ordering --- src/run.sh | 20 +++++++++++++++++++ .../15-ufw.sh | 0 2 files changed, 20 insertions(+) rename src/{steps-postinstall => steps-last}/15-ufw.sh (100%) diff --git a/src/run.sh b/src/run.sh index d565de9..8ef6edc 100644 --- a/src/run.sh +++ b/src/run.sh @@ -121,6 +121,10 @@ stage_end "$?"; ############################################################################### +### +# Pre-install tasks +### + while read -r preinstall_step; do #shellcheck disable=SC1090 source "steps-preinstall/${preinstall_step}"; @@ -128,11 +132,27 @@ done < <(cat "${temp_dir}/steps-preinstall.txt"); ############################################################################### +### +# Install packages +### + apt-get install "$(cat "${temp_dir}/apt-packages.txt")"; ############################################################################### +### +# Post-install tasks +### + while read -r postinstall_step; do #shellcheck disable=SC1090 source "steps-postinstall/${postinstall_step}"; done < <(cat "${temp_dir}/steps-postinstall.txt"); + +############################################################################### + +### +# Final steps +### + +source "steps-last/15-ufw.sh"; diff --git a/src/steps-postinstall/15-ufw.sh b/src/steps-last/15-ufw.sh similarity index 100% rename from src/steps-postinstall/15-ufw.sh rename to src/steps-last/15-ufw.sh