diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2022-05-01 10:52:19 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2022-05-01 10:52:19 +0200 |
commit | dac43a7fad6f768b25fc9309813ee2dcb0e458c5 (patch) | |
tree | c697f7fb8f40f0e38b90bb92981c3679abde1f69 | |
parent | b73804edc6350363de3595e873ca156d92c0166c (diff) | |
download | OpenBSD-firewall-dac43a7fad6f768b25fc9309813ee2dcb0e458c5.tar.gz OpenBSD-firewall-dac43a7fad6f768b25fc9309813ee2dcb0e458c5.tar.bz2 |
updated local configuration
-rw-r--r-- | config/obr/dhcpd.conf | 12 | ||||
-rw-r--r-- | config/obr/nsd-external/etc/nsd.conf | 8 | ||||
-rw-r--r-- | config/obr/nsd-external/zones/andreasbaumann.cc | 4 | ||||
-rw-r--r-- | config/obr/nsd-internal/zones/1.168.192.in-addr | 3 | ||||
-rw-r--r-- | config/obr/nsd-internal/zones/lan | 3 | ||||
-rw-r--r-- | config/obr/pf.conf | 1 |
6 files changed, 17 insertions, 14 deletions
diff --git a/config/obr/dhcpd.conf b/config/obr/dhcpd.conf index 618cc19..7a36a2b 100644 --- a/config/obr/dhcpd.conf +++ b/config/obr/dhcpd.conf @@ -29,11 +29,6 @@ shared-network LAN { fixed-address 192.168.1.6; } - host europa6 { - hardware ethernet 08:00:20:82:F1:1A; - fixed-address 192.168.1.7; - } - host eeepc { hardware ethernet 00:1f:c6:5c:64:43; fixed-address 192.168.1.8; @@ -195,7 +190,7 @@ shared-network LAN { } host eurobuild6 { - hardware ethernet 46:38:02:d3:a1:a7; + hardware ethernet 12:90:0e:ce:f9:e1; fixed-address 192.168.1.34; } @@ -219,6 +214,11 @@ shared-network LAN { fixed-address 192.168.1.42; } + host eurobuild14 { + hardware ethernet e4:5f:01:3a:0c:6f; + fixed-address 192.168.1.43; + } + host euroweb3 { hardware ethernet 00:00:24:d1:dc:a8; fixed-address 192.168.1.38; diff --git a/config/obr/nsd-external/etc/nsd.conf b/config/obr/nsd-external/etc/nsd.conf index ee10c58..a8435e7 100644 --- a/config/obr/nsd-external/etc/nsd.conf +++ b/config/obr/nsd-external/etc/nsd.conf @@ -36,7 +36,7 @@ zone: provide-xfr: 103.6.87.125 NOKEY provide-xfr: 192.184.93.99 NOKEY provide-xfr: 119.252.20.56 NOKEY - provide-xfr: 107.181.178.180 NOKEY + provide-xfr: 31.220.30.73 NOKEY provide-xfr: 185.34.136.178 NOKEY provide-xfr: 185.136.176.247 NOKEY provide-xfr: 45.77.29.133 NOKEY @@ -60,7 +60,7 @@ zone: provide-xfr: 103.6.87.125 NOKEY provide-xfr: 192.184.93.99 NOKEY provide-xfr: 119.252.20.56 NOKEY - provide-xfr: 107.181.178.180 NOKEY + provide-xfr: 31.220.30.73 NOKEY provide-xfr: 185.34.136.178 NOKEY provide-xfr: 185.136.176.247 NOKEY provide-xfr: 45.77.29.133 NOKEY @@ -84,7 +84,7 @@ zone: provide-xfr: 103.6.87.125 NOKEY provide-xfr: 192.184.93.99 NOKEY provide-xfr: 119.252.20.56 NOKEY - provide-xfr: 107.181.178.180 NOKEY + provide-xfr: 31.220.30.73 NOKEY provide-xfr: 185.34.136.178 NOKEY provide-xfr: 185.136.176.247 NOKEY provide-xfr: 45.77.29.133 NOKEY @@ -108,7 +108,7 @@ zone: provide-xfr: 103.6.87.125 NOKEY provide-xfr: 192.184.93.99 NOKEY provide-xfr: 119.252.20.56 NOKEY - provide-xfr: 107.181.178.180 NOKEY + provide-xfr: 31.220.30.73 NOKEY provide-xfr: 185.34.136.178 NOKEY provide-xfr: 185.136.176.247 NOKEY provide-xfr: 45.77.29.133 NOKEY diff --git a/config/obr/nsd-external/zones/andreasbaumann.cc b/config/obr/nsd-external/zones/andreasbaumann.cc index 75c667b..e0f517c 100644 --- a/config/obr/nsd-external/zones/andreasbaumann.cc +++ b/config/obr/nsd-external/zones/andreasbaumann.cc @@ -3,7 +3,7 @@ $TTL 60 @ IN SOA ns.andreasbaumann.cc. admin.andreasbaumann.cc. ( - 2021041500 ; serial + 2021111001 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -21,12 +21,12 @@ mail._domainkey IN TXT ( "v=DKIM1; k=rsa; s=email; " "Z4vIq/yHM8/az5peVoaaFA1A+RVMLvy+o1XbhMBsM7nOnDPcQxPyxBcDmedgbni6F3I8Vl2hYDvcjza5eJ8fJVxjLBVWMYAhRowWzl0TU9nyeHBbncCYW9QiNBicHQy88CAwEAAQ==" ) _dmarc IN TXT "v=DMARC1; p=none; adkim=s; aspf=r; fo=1; rua=mailto:postmaster@andreasbaumann.cc; ruf=mailto:postmaster@andreasbaumann.cc" - $ORIGIN andreasbaumann.cc. ns IN A 83.150.2.48 smtp IN A 83.150.2.48 + www IN A 83.150.2.48 cloud IN A 83.150.2.48 ftp IN A 83.150.2.48 diff --git a/config/obr/nsd-internal/zones/1.168.192.in-addr b/config/obr/nsd-internal/zones/1.168.192.in-addr index c2a349d..f6f86b3 100644 --- a/config/obr/nsd-internal/zones/1.168.192.in-addr +++ b/config/obr/nsd-internal/zones/1.168.192.in-addr @@ -5,7 +5,7 @@ $ORIGIN . $TTL 60 1.168.192.in-addr.arpa IN SOA obr.lan. root.obr.lan. ( - 2021102300 ; serial + 2022050100 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -53,4 +53,5 @@ $ORIGIN 1.168.192.in-addr.arpa. 40 IN PTR eurobuild3-i486.lan. 41 IN PTR eurobuild12.lan. 42 IN PTR eurobuild13.lan. +43 IN PTR eurobuild14.lan. 254 IN PTR wrt1.lan. diff --git a/config/obr/nsd-internal/zones/lan b/config/obr/nsd-internal/zones/lan index 6967565..37db7a1 100644 --- a/config/obr/nsd-internal/zones/lan +++ b/config/obr/nsd-internal/zones/lan @@ -5,7 +5,7 @@ $ORIGIN . $TTL 60 lan IN SOA obr.lan. root.obr.lan. ( - 2021102300 ; serial + 2022050100 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -53,5 +53,6 @@ eurobuild6-8-i486 A 192.168.1.39 eurobuild3-i486 A 192.168.1.40 eurobuild12 A 192.168.1.41 eurobuild13 A 192.168.1.42 +eurobuild14 A 192.168.1.43 wrt1 A 192.168.1.254 iway-gateway A 83.150.2.1 diff --git a/config/obr/pf.conf b/config/obr/pf.conf index a6822a4..5146ec8 100644 --- a/config/obr/pf.conf +++ b/config/obr/pf.conf @@ -148,6 +148,7 @@ pass in on $ext_if proto tcp from any to port 5914 rdr-to $eurobuild6 port 5904 pass in on $ext_if proto tcp from any to port 5917 rdr-to $eurobuild6 port 5907 pass in on $ext_if proto tcp from any to port 5919 rdr-to $eurobuild6 port 5909 pass in on $ext_if proto tcp from any to port 6881:6889 rdr-to $eurobuild3 +pass in on $ext_if proto tcp from any to port 6969 rdr-to $eurobuild3 pass in on $ext_if proto tcp from any to port 9981:9982 rdr-to $eurobuild3 pass in on $ext_if proto tcp from any to port 8080 rdr-to $eurobuild3 |