Changeset 10704 in hybrid for branches/releng-9.0

Timestamp:

May 7, 2012, 2:45:33 PM (13 years ago)

Author:

rick

Message:

Let the redirected be controlled by gformat (yaml).

Related-To: nodefactory#152

Location:

branches/releng-9.0/nanobsd/files

Files:

• etc/pf.hybrid.conf (modified) (1 diff)
• etc/pf.hybrid.conf.local (added)
• tools/wl-config (modified) (2 diffs)

branches/releng-9.0/nanobsd/files/etc/pf.hybrid.conf

@@ -59 +59 @@
 rdr on { $captive_portal_interfaces } proto tcp from $wl_net to !$wl_net port http -> 172.31.255.1 port 8081
 
-# Redirect some internal facing services outside (7)
-rdr on $ext_if inet proto tcp from any to $ext_if port 8081 tag SRV -> 172.16.4.46 port http
+# Load autogenerated entries, like the remote mappings (7)
+include "/etc/pf.hybrid.conf.local"
 
 # Make the device on WL find the proper gateway back (7)

branches/releng-9.0/nanobsd/files/tools/wl-config

@@ -32 +32 @@
 # Determine it's statup and running location and some other hints
 # Skip named.conf as it not planned in current release
-FILES="authorized_keys dhcpd.conf dnsmasq.conf motd rc.conf.local resolv.conf wleiden.yaml"
+FILES="authorized_keys dhcpd.conf dnsmasq.conf motd rc.conf.local resolv.conf pf.hybrid.conf.local wleiden.yaml"
 file_details() {
   POST_CMD=""
@@ -70 +70 @@
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
+   ;;
+   'pf.hybrid.conf.local')
+     STARTUP_LOC="/cfg/${FILE}"
+     RUNNING_LOC="/etc/${FILE}"
+     POST_CMD="service pf reload"
    ;;
    'wleiden.yaml')