brielle
/
SRFirewall
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

master
bbruns 2014-04-12 20:56:34 +00:00
parent 7ecd9238d5
commit 698b565142
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/srfirewall
View File

@ -42,12 +42,9 @@ source "${FWCONFIGDIR}/ipv6.conf"
# The local.conf file can be used to override any of the above files without having to worry # The local.conf file can be used to override any of the above files without having to worry
# about changes being overwritten when upgrading. Mostly useful for people who use a package # about changes being overwritten when upgrading. Mostly useful for people who use a package
# manager. # manager.
[[ -e "${FWCONFIGDIR}/local.conf" ]] && source "${FWCONFIGDIR}/local.conf" \ [[ -e "${FWCONFIGDIR}/local.conf" ]] && source "${FWCONFIGDIR}/local.conf"
&& ${display} GREEN "Found ${FWCONFIGDIR}/local.conf. Loading overrides." [[ -e "${FWCONFIGDIR}/ipv4/local.conf" ]] && source "${FWCONFIGDIR}/ipv4/local.conf"
[[ -e "${FWCONFIGDIR}/ipv4/local.conf" ]] && source "${FWCONFIGDIR}/ipv4/local.conf" \ [[ -e "${FWCONFIGDIR}/ipv6/local.conf" ]] && source "${FWCONFIGDIR}/ipv6/local.conf"
&& ${display} GREEN "Found ${FWCONFIGDIR}/ipv4/local.conf. Loading overrides."
[[ -e "${FWCONFIGDIR}/ipv6/local.conf" ]] && source "${FWCONFIGDIR}/ipv6/local.conf" \
&& ${display} GREEN "Found ${FWCONFIGDIR}/ipv6/local.conf. Loading overrides."
# We require at least bash v2 or later at this point given some of the more complex # We require at least bash v2 or later at this point given some of the more complex