From b9a966b4f7ae6e438565912b964c726b126a1454 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 15 Apr 2018 09:23:27 +0200 Subject: synchronized personal configuration of router (before upgrading) --- config/obr/dhcpd.conf | 21 +++++++++++++++++++++ config/obr/nsd-external/zones/andreasbaumann.cc | 2 +- config/obr/nsd-internal/zones/1.168.192.in-addr | 3 ++- config/obr/nsd-internal/zones/andreasbaumann.cc | 2 +- config/obr/nsd-internal/zones/lan | 3 ++- config/obr/pf.conf | 9 +++++++-- config/obr/rc.services | 2 +- config/obr/relayd.conf | 2 +- 8 files changed, 36 insertions(+), 8 deletions(-) diff --git a/config/obr/dhcpd.conf b/config/obr/dhcpd.conf index 79688de..b6fcbf5 100644 --- a/config/obr/dhcpd.conf +++ b/config/obr/dhcpd.conf @@ -8,6 +8,7 @@ shared-network LAN { option subnet-mask 255.255.255.0; allow booting; allow bootp; + next-server 192.168.1.12; subnet 192.168.1.0 netmask 255.255.255.0 { option routers 192.168.1.1; @@ -20,6 +21,7 @@ shared-network LAN { host europa1 { hardware ethernet 00:00:E2:3C:A2:3B; fixed-address 192.168.1.2; + filename "pxelinux.0"; } host europa5 { @@ -116,5 +118,24 @@ shared-network LAN { hardware ethernet B8:27:EB:A0:10:58; fixed-address 192.168.1.24; } + + host euroalix { + hardware ethernet 00:0D:B9:0F:62:78; + fixed-address 192.168.1.25; + filename "pxelinux.0"; + } + + host eurounisys { + hardware ethernet 00:00:E8:CD:05:88; + fixed-address 192.168.1.26; + filename "pxelinux.0"; + } + + host pxe486 { + hardware ethernet 52:54:00:C0:F9:14; + fixed-address 192.168.1.26; + filename "pxelinux.0"; + } + } } diff --git a/config/obr/nsd-external/zones/andreasbaumann.cc b/config/obr/nsd-external/zones/andreasbaumann.cc index 3d895a9..b2eb504 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. ( - 2017121000 ; serial + 2017121600 ; serial 3h ; refresh 15m ; retry 2w ; expire 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 da3cf1d..b0e5853 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. ( - 2017080800 ; serial + 2017122800 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -37,5 +37,6 @@ $ORIGIN 1.168.192.in-addr.arpa. 22 IN PTR eurobuild6.lan. 23 IN PTR eurobuild7.lan. 24 IN PTR eurotv.lan. +25 IN PTR euroalix.lan. 253 IN PTR wrt2.lan. 254 IN PTR wrt1.lan. diff --git a/config/obr/nsd-internal/zones/andreasbaumann.cc b/config/obr/nsd-internal/zones/andreasbaumann.cc index 2f8e4b3..ed4ebac 100644 --- a/config/obr/nsd-internal/zones/andreasbaumann.cc +++ b/config/obr/nsd-internal/zones/andreasbaumann.cc @@ -3,7 +3,7 @@ $TTL 60 @ IN SOA ns.andreasbaumann.cc. root.andreasbaumann.cc. ( - 2017121000 ; serial + 2017121600 ; serial 3h ; refresh 15m ; retry 2w ; expire diff --git a/config/obr/nsd-internal/zones/lan b/config/obr/nsd-internal/zones/lan index 820d4c2..46f6498 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. ( - 2017080800 ; serial + 2017122800 ; serial 3h ; refresh 15m ; retry 2w ; expire @@ -37,6 +37,7 @@ eurobuild5 A 192.168.1.21 eurobuild6 A 192.168.1.22 eurobuild7 A 192.168.1.23 eurotv A 192.168.1.24 +euroalix A 192.168.1.25 wrt2 A 192.168.1.253 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 f60828c..c6a4599 100644 --- a/config/obr/pf.conf +++ b/config/obr/pf.conf @@ -21,7 +21,7 @@ eurobuild4 = 192.168.1.18 eurobuild5 = 192.168.1.21 eurodata = 192.168.1.9 euroweb = 192.168.1.15 -rpmaster = 192.168.1.253 +euromac = 192.168.1.20 # our own networks table const { 192.168.1.0/24 } @@ -105,8 +105,13 @@ pass in on $ext_if proto tcp from any to port 2222 rdr-to $eurodata port 22 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 2224 rdr-to $eurobuild4 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 5900:5999 rdr-to $eurobuild3 +pass in on $ext_if proto tcp from any to port 2226 rdr-to $euromac port 22 +pass in on $ext_if proto tcp from any to port 5999 rdr-to $euromac port 5900 +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 6881:6889 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 6001 rdr-to $europa1 port 6000 pass in on $ext_if proto tcp from any to port 9372 rdr-to $eeepc port 9372 +pass in on $ext_if proto udp from any to port 5000:5100 rdr-to $eeepc +pass in on $ext_if proto tcp from any to port 1720 rdr-to $eeepc + diff --git a/config/obr/rc.services b/config/obr/rc.services index 6be4e49..1ae324e 100644 --- a/config/obr/rc.services +++ b/config/obr/rc.services @@ -9,7 +9,7 @@ done echo unbound: starting DNS resolver.. cp -R /etc/unbound /tmp/var/unbound -/usr/sbin/unbound +/usr/sbin/unbound -c /etc/unbound/etc/unbound.conf echo dhcp: starting DHCP server... touch /var/db/dhcpd.leases diff --git a/config/obr/relayd.conf b/config/obr/relayd.conf index f9cf007..ba52e74 100644 --- a/config/obr/relayd.conf +++ b/config/obr/relayd.conf @@ -58,6 +58,6 @@ relay http_relay { forward to port 80 forward to port 80 - forward to port 8080 + forward to port 80 } -- cgit v1.2.3-54-g00ecf