From edadee29b35923c68b80c0a1a8f42d12026d64f7 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 2 Aug 2022 22:39:32 -0700
Subject: [PATCH] Init config scratchpad

---
 router/config/new.config | 103 +++++----------------------------------
 1 file changed, 13 insertions(+), 90 deletions(-)

diff --git a/router/config/new.config b/router/config/new.config
index 266d92d..8dd7847 100644
--- a/router/config/new.config
+++ b/router/config/new.config
@@ -101,17 +101,6 @@ firewall {
                 new enable
             }
         }
-        rule 1006 {
-            action accept
-            description "Peertube Live"
-            destination {
-                port 1935
-            }
-            protocol tcp_udp
-            state {
-                new enable
-            }
-        }
         rule 1007 {
             action accept
             description "Git SSH"
@@ -134,17 +123,6 @@ firewall {
                 new enable
             }
         }
-        rule 1009 {
-            action accept
-            description Terraria
-            destination {
-                port 50777
-            }
-            protocol tcp_udp
-            state {
-                new enable
-            }
-        }
     }
     name WAN_LOCAL {
         default-action drop
@@ -178,16 +156,6 @@ firewall {
     syn-cookies enable
 }
 interfaces {
-    bridge br0 {
-        address 192.168.1.1/24
-        member {
-            interface eth1 {
-            }
-            interface eth2 {
-            }
-        }
-        stp
-    }
     ethernet eth0 {
         address 192.168.200.1/24
         description "Emergency ad-hoc"
@@ -197,6 +165,7 @@ interfaces {
     }
     ethernet eth1 {
         description "Primary Switch"
+        address 192.168.1.1/24
         duplex auto
         hw-id 00:15:17:b8:dc:28
         offload {
@@ -321,17 +290,6 @@ nat {
                 address 192.168.1.23
             }
         }
-        rule 1006 {
-            description "Peertube Live"
-            destination {
-                port 1935
-            }
-            inbound-interface pppoe1
-            protocol tcp_udp
-            translation {
-                address 192.168.1.23
-            }
-        }
         rule 1007 {
             description "Git SSH"
             destination {
@@ -354,24 +312,13 @@ nat {
                 address 192.168.1.23
             }
         }
-        rule 1009 {
-            description Terraria
-            destination {
-                port 50777
-            }
-            inbound-interface pppoe1
-            protocol tcp_udp
-            translation {
-                address 192.168.1.23
-            }
-        }
         rule 1100 {
             description "Plex (Hairpin NAT)"
             destination {
                 address 174.21.53.164
                 port 32400
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -383,7 +330,7 @@ nat {
                 address 174.21.53.164
                 port 50000
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -395,7 +342,7 @@ nat {
                 address 174.21.53.164
                 port 53820-53829
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -407,7 +354,7 @@ nat {
                 address 174.21.53.164
                 port 25565
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -419,7 +366,7 @@ nat {
                 address 174.21.53.164
                 port 50201
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -431,19 +378,7 @@ nat {
                 address 174.21.53.164
                 port 80,443
             }
-            inbound-interface br0
-            protocol tcp_udp
-            translation {
-                address 192.168.1.23
-            }
-        }
-        rule 1106 {
-            description "Peertube Live (Hairpin NAT)"
-            destination {
-                address 174.21.53.164
-                port 1935
-            }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -455,7 +390,7 @@ nat {
                 address 174.21.53.164
                 port 2228-2229
             }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -467,19 +402,7 @@ nat {
                 address 174.21.53.164
                 port 23450
             }
-            inbound-interface br0
-            protocol tcp_udp
-            translation {
-                address 192.168.1.23
-            }
-        }
-        rule 1109 {
-            description "Terraria (Hairpin NAT)"
-            destination {
-                address 174.21.53.164
-                port 50777
-            }
-            inbound-interface br0
+            inbound-interface eth1
             protocol tcp_udp
             translation {
                 address 192.168.1.23
@@ -502,7 +425,7 @@ nat {
             destination {
                 address 192.168.1.0/24
             }
-            outbound-interface br0
+            outbound-interface eth1
             protocol tcp_udp
             source {
                 address 192.168.1.0/24
@@ -530,7 +453,7 @@ service {
                 }
                 static-mapping U6-Lite {
                     ip-address 192.168.1.3
-                    mac-address 18:e8:29:50:f7:5b
+                    mac-address 78:45:58:67:87:14
                 }
                 static-mapping UAP-AC-LR {
                     ip-address 192.168.1.2
@@ -588,7 +511,7 @@ service {
         port 22
     }
     upnp {
-        listen br0
+        listen eth1
         wan-interface pppoe1
     }
 }
@@ -668,7 +591,7 @@ zone-policy {
                 name WAN_IN
             }
         }
-        interface br0
+        interface eth1
     }
     zone LOCAL {
         default-action drop