diff --git a/README.md b/README.md index 5791290..eee1737 100644 --- a/README.md +++ b/README.md @@ -121,9 +121,9 @@ table persist nat on $ext_if from to any -> ($ext_if) ## static rdr example -## rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45 +# rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45 -# Enable dynamic rdr (see below) +## Enable dynamic rdr (see below) rdr-anchor "rdr/*" block in all @@ -131,7 +131,7 @@ pass out quick modulate state antispoof for $ext_if inet pass in inet proto tcp from any to any port ssh flags S/SA keep state -# make sure you also open up ports that you are going to use for dynamic rdr +## make sure you also open up ports that you are going to use for dynamic rdr # pass in inet proto tcp from any to any port : flags S/SA keep state # pass in inet proto udp from any to any port : flags S/SA keep state @@ -241,11 +241,6 @@ release version as the argument. ishmael ~ # bastille bootstrap 11.3-RELEASE ``` -**FreeBSD 12.0-RELEASE** -```shell -ishmael ~ # bastille bootstrap 12.0-RELEASE -``` - **FreeBSD 12.1-RELEASE** ```shell ishmael ~ # bastille bootstrap 12.1-RELEASE diff --git a/usr/local/share/bastille/import.sh b/usr/local/share/bastille/import.sh index f67f2ab..53c8057 100644 --- a/usr/local/share/bastille/import.sh +++ b/usr/local/share/bastille/import.sh @@ -274,7 +274,7 @@ fi # Check if archive exist then trim archive name if ls "${bastille_backupsdir}" | awk "/^${TARGET}$/"; then - TARGET_TRIM=$(echo "${TARGET}" | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*:[0-9]*:[0-9]*.[txz]\{2,3\}//g;s/_[0-9]*-[0-9]*-[0-9]*.zip//g") + TARGET_TRIM=$(echo "${TARGET}" | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*.[txz]\{2,3\}//g;s/_[0-9]*-[0-9]*-[0-9]*.zip//g") else error_notify "${COLOR_RED}Archive '${TARGET}' not found.${COLOR_RESET}" fi