Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-20 09:10:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

bastille: fix sourcing common before the config file check, this ensures setup can run correctly

Browse Source
This commit is contained in:
Juan David Hurtado G
2025-01-11 15:55:21 -05:00
parent 8b0411c111
commit c544727d40
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
usr/local/bin/bastille
View File

@@ -32,20 +32,23 @@
PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
. /usr/local/share/bastille/common.sh
## check for config existence ## check for config existence
bastille_conf_check() { bastille_conf_check() {
if [ ! -r "/usr/local/etc/bastille/bastille.conf" ]; then if [ ! -r "/usr/local/etc/bastille/bastille.conf" ]; then
warn "Configuration file not found. Do yu want to create it with default values? [y/N]" echo "[INFO] Configuration file not found. Do yu want to create it with default values? [y/N]"
read answer read answer
case "${answer}" in case "${answer}" in
[Nn][Oo]|[Nn]|"") [Nn][Oo]|[Nn]|"")
error_exit "No configuration file has been generated. Exiting." echo "[INFO] No configuration file has been generated. Exiting."
exit
;; ;;
[Yy][Ee][Ss]|[Yy]) [Yy][Ee][Ss]|[Yy])
cp /usr/local/etc/bastille/bastille.conf.sample /usr/local/etc/bastille/bastille.conf cp /usr/local/etc/bastille/bastille.conf.sample /usr/local/etc/bastille/bastille.conf
info "Configuration file has been generated. Continuing with default values" echo "[INFO] Configuration file has been generated. Continuing with default values"
;;
*)
echo "[ERROR] Invalid option. Please answer with 'y' or 'N'."
exit 1
;; ;;
esac esac
fi fi
@@ -53,7 +56,8 @@ bastille_conf_check() {
bastille_conf_check bastille_conf_check
## we only load the config if conf_check passes ## we only load this if conf_check passes
. /usr/local/share/bastille/common.sh
. /usr/local/etc/bastille/bastille.conf . /usr/local/etc/bastille/bastille.conf
# Set default values for config properties added during the current major version: # Set default values for config properties added during the current major version:
: "${bastille_network_pf_ext_if:=ext_if}" : "${bastille_network_pf_ext_if:=ext_if}"