mt: install jail.conf file with store_config

so theres a .mt6 laying nearby
msimerson · Mar 26, 2024 · 237a099 · 237a099
1 parent 2e5f5b5
commit 237a099
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/mail-toaster.sh b/mail-toaster.sh
@@ -483,14 +483,7 @@ get_safe_jail_path()
 
 add_jail_conf_d()
 {
-	_safe_path="/etc/jail.conf.d/$(safe_jailname $1).conf"
-	if [ -f "/etc/jail.conf.d/$1.conf" ]; then
-		tell_status "preserving jail config $_safe_path"
-		return
-	fi
-
-	tell_status "creating $_safe_path"
-	tee "$_safe_path" <<EO_JAIL_RC
+	store_config "/etc/jail.conf.d/$(safe_jailname $1).conf" <<EO_JAIL_RC
 $(jail_conf_header)
 
 $(safe_jailname $1)	{$(get_safe_jail_path $1)

diff --git a/provision/host.sh b/provision/host.sh
@@ -332,7 +332,7 @@ ext_if="$PUBLIC_NIC"
 ext_ip4="$PUBLIC_IP4"
 ext_ip6="$PUBLIC_IP6"
 
-table <ext_ip>  { \$ext_ip4 \$ext_ip6 } persist
+table <ext_ip>  { \$ext_ip4, \$ext_ip6 } persist
 table <ext_ip4> { \$ext_ip4 } persist
 table <ext_ip6> { \$ext_ip6 } persist