diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2021-10-24 09:44:21 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2021-10-24 09:44:21 +0200 |
| commit | 8c72227c4459d8d6e5430e9949634ccab1dd8a88 (patch) | |
| tree | 254a1031f51c3368a0b5d11b1dff323b614b8fee /config | |
| parent | 22c9d4726a2c6c246807d7c666caae27d03a3af9 (diff) | |
| download | OpenBSD-firewall-8c72227c4459d8d6e5430e9949634ccab1dd8a88.tar.gz OpenBSD-firewall-8c72227c4459d8d6e5430e9949634ccab1dd8a88.tar.bz2 | |
some configuration cleanup in 'obr'
added some links and findings to TODOs
Diffstat (limited to 'config')
| -rw-r--r-- | config/obr/dhcpd.conf | 17 | ||||
| -rw-r--r-- | config/obr/nsd-internal/zones/1.168.192.in-addr | 6 | ||||
| -rw-r--r-- | config/obr/nsd-internal/zones/lan | 6 | ||||
| -rw-r--r-- | config/obr/pf.conf | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/config/obr/dhcpd.conf b/config/obr/dhcpd.conf index d042dc1..618cc19 100644 --- a/config/obr/dhcpd.conf +++ b/config/obr/dhcpd.conf @@ -162,11 +162,6 @@ shared-network LAN { filename "pxelinux.0"; } - host eurobuild3-pfrey-mewa { - hardware ethernet 52:54:00:6f:b0:77; - fixed-address 192.168.1.41; - } - host i486test { hardware ethernet 52:54:00:32:AD:3A; fixed-address 192.168.1.28; @@ -214,6 +209,16 @@ shared-network LAN { fixed-address 192.168.1.37; } + host eurobuild12 { + hardware ethernet 00:11:2f:19:98:4b; + fixed-address 192.168.1.41; + } + + host eurobuild13 { + hardware ethernet 00:90:fb:04:67:62; + fixed-address 192.168.1.42; + } + host euroweb3 { hardware ethernet 00:00:24:d1:dc:a8; fixed-address 192.168.1.38; @@ -224,7 +229,5 @@ shared-network LAN { fixed-address 192.168.1.254; } - - } } 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 b643d47..c2a349d 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. ( - 2021041500 ; serial + 2021102300 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -51,6 +51,6 @@ $ORIGIN 1.168.192.in-addr.arpa. 38 IN PTR euroweb3.lan. 39 IN PTR eurobuild6-8-i486.lan. 40 IN PTR eurobuild3-i486.lan. -41 IN PTR eurobuild3-pfrey-mewa.lan. -42 IN PTR eurobuild3-libraries.lan. +41 IN PTR eurobuild12.lan. +42 IN PTR eurobuild13.lan. 254 IN PTR wrt1.lan. diff --git a/config/obr/nsd-internal/zones/lan b/config/obr/nsd-internal/zones/lan index 172028b..6967565 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. ( - 2021041500 ; serial + 2021102300 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -51,7 +51,7 @@ eurobuild11 A 192.168.1.37 euroweb3 A 192.168.1.38 eurobuild6-8-i486 A 192.168.1.39 eurobuild3-i486 A 192.168.1.40 -eurobuild3-pfrey-mewa A 192.168.1.41 -eurobuild3-libraries A 192.168.1.42 +eurobuild12 A 192.168.1.41 +eurobuild13 A 192.168.1.42 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 3d48d93..a6822a4 100644 --- a/config/obr/pf.conf +++ b/config/obr/pf.conf @@ -142,8 +142,10 @@ pass in on $ext_if proto tcp from any to port 2223 rdr-to $eurobuild3 port 22 #pass in on $ext_if proto tcp from any to port 2225 rdr-to $eurobuild5 port 22 pass in on $ext_if proto tcp from any to port 2228 rdr-to $eurobuild6 port 22 pass in on $ext_if proto tcp from any to port 5900:5998 rdr-to $eurobuild3 +pass in on $ext_if proto tcp from any to port 5911 rdr-to $eurobuild6 port 5901 pass in on $ext_if proto tcp from any to port 5912 rdr-to $eurobuild6 port 5902 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 9981:9982 rdr-to $eurobuild3 |