summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/obr/dhcpd.conf21
-rw-r--r--config/obr/nsd-external/zones/andreasbaumann.cc43
-rw-r--r--config/obr/nsd-internal/zones/1.168.192.in-addr3
-rw-r--r--config/obr/nsd-internal/zones/andreasbaumann.cc3
-rw-r--r--config/obr/nsd-internal/zones/lan3
-rw-r--r--config/obr/pf.conf9
-rw-r--r--config/obr/rc.services2
-rw-r--r--config/obr/relayd.conf4
-rw-r--r--config/obr/unbound/etc/root.hints6
9 files changed, 64 insertions, 30 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 d6912bf..b2eb504 100644
--- a/config/obr/nsd-external/zones/andreasbaumann.cc
+++ b/config/obr/nsd-external/zones/andreasbaumann.cc
@@ -3,37 +3,38 @@
$TTL 60
@ IN SOA ns.andreasbaumann.cc. admin.andreasbaumann.cc. (
- 2017010800 ; serial
+ 2017121600 ; serial
3h ; refresh
15m ; retry
2w ; expire
60 ; minimum TTL
)
- IN NS d.ns.buddyns.com.
- IN NS e.ns.buddyns.com.
- IN NS h.ns.buddyns.com.
- IN MX 10 smtp.andreasbaumann.cc.
- IN TXT "v=spf1 mx ip4:83.150.2.48/24 ~all"
+ IN NS d.ns.buddyns.com.
+ IN NS e.ns.buddyns.com.
+ IN NS h.ns.buddyns.com.
+ IN MX 10 smtp.andreasbaumann.cc.
+ IN TXT "v=spf1 mx ip4:83.150.2.48/24 ~all"
$ORIGIN andreasbaumann.cc.
- IN A 83.150.2.48
+ IN A 83.150.2.48
-ns IN A 83.150.2.48
-smtp IN A 83.150.2.48
+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
-blog IN A 83.150.2.48
-ftp IN A 83.150.2.48
-imap IN A 83.150.2.48
-pop IN A 83.150.2.48
-smtp IN A 83.150.2.48
-webmail IN A 83.150.2.48
-git IN A 83.150.2.48
-devel IN A 83.150.2.48
-mon IN A 83.150.2.48
+www IN A 83.150.2.48
+cloud IN A 83.150.2.48
+blog IN A 83.150.2.48
+ftp IN A 83.150.2.48
+imap IN A 83.150.2.48
+pop IN A 83.150.2.48
+smtp IN A 83.150.2.48
+webmail IN A 83.150.2.48
+git IN A 83.150.2.48
+devel IN A 83.150.2.48
+mon IN A 83.150.2.48
+archlinux32 IN A 83.150.2.48
; this is hosted at GoDaddy
-backup IN A 192.186.235.194
+backup IN A 192.186.235.194
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 4157c2b..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. (
- 2017010800 ; serial
+ 2017121600 ; serial
3h ; refresh
15m ; retry
2w ; expire
@@ -31,6 +31,7 @@ www A 192.168.1.15
git A 192.168.1.15
devel A 192.168.1.12
mon A 192.168.1.16
+archlinux32 A 192.168.1.12
; hosted at godaddy
backup A 192.186.235.194
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 <intNetworks> 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 6be42f6..ba52e74 100644
--- a/config/obr/relayd.conf
+++ b/config/obr/relayd.conf
@@ -10,6 +10,7 @@ EXT_IF = 83.150.2.48
table <euroweb> { euroweb.lan }
table <euroserver> { euroserver.lan }
+table <eurobuild3> { eurobuild3.lan }
http protocol "http_protocol" {
@@ -45,6 +46,8 @@ http protocol "http_protocol" {
forward to <euroweb> no tag
match request quick header "Host" value "mon.andreasbaumann.cc" \
forward to <euroserver> no tag
+ match request quick header "Host" value "archlinux32.andreasbaumann.cc" \
+ forward to <eurobuild3> no tag
block request tagged disallowed_host label "BAD host"
}
@@ -55,5 +58,6 @@ relay http_relay {
forward to <euroweb> port 80
forward to <euroserver> port 80
+ forward to <eurobuild3> port 80
}
diff --git a/config/obr/unbound/etc/root.hints b/config/obr/unbound/etc/root.hints
index 198d1b3..53b3d85 100644
--- a/config/obr/unbound/etc/root.hints
+++ b/config/obr/unbound/etc/root.hints
@@ -9,8 +9,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: August 29, 2017
-; related version of root zone: 2017082901
+; last update: April 12, 2018
+; related version of root zone: 2018041201
;
; FORMERLY NS.INTERNIC.NET
;
@@ -21,7 +21,7 @@ A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30
; FORMERLY NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
+B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201
B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b
;
; FORMERLY C.PSI.NET
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-05-13 22:25:22 +0000