synched personal configuration from live system

6 files changed, 18 insertions, 11 deletions

diff --git a/config/obr/nsd-external/zones/andreasbaumann.cc b/config/obr/nsd-external/zones/andreasbaumann.cc
index 273326f..298e8e4 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. (
-				2016012400	; serial
+				2016071400	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -11,8 +11,8 @@ $TTL 60
 			)
 
 	IN	NS		d.ns.buddyns.com.
-	IN	NS		c.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"
 
diff --git a/config/obr/nsd-external/zones/bikecentum.com b/config/obr/nsd-external/zones/bikecentum.com
index 50175f3..a35fdc3 100644
--- a/config/obr/nsd-external/zones/bikecentum.com
+++ b/config/obr/nsd-external/zones/bikecentum.com
@@ -3,7 +3,7 @@
 $TTL 60
 
 @		IN	SOA	ns.bikecentum.com. admin.bikecentum.com. (
-				2015100804	; serial
+				2016062200	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -11,8 +11,8 @@ $TTL 60
 			)
 
 	IN	NS		d.ns.buddyns.com.
-	IN	NS		c.ns.buddyns.com.
 	IN	NS		e.ns.buddyns.com.
+	IN	NS		h.ns.buddyns.com.
 	IN	MX	10	smtp.bikecentum.com.
 	IN	TXT		"v=spf1 mx ip4:83.150.2.48/24 ~all"
 
diff --git a/config/obr/nsd-external/zones/maschezuoz.ch b/config/obr/nsd-external/zones/maschezuoz.ch
index 3efa1a3..f9e7336 100644
--- a/config/obr/nsd-external/zones/maschezuoz.ch
+++ b/config/obr/nsd-external/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
 $TTL 60
 
 @		IN	SOA	ns.maschezuoz.ch. admin.maschezuoz.ch. (
-				2015100901	; serial
+				2016062200	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -11,8 +11,8 @@ $TTL 60
 			)
 
 	IN	NS		d.ns.buddyns.com.
-	IN	NS		c.ns.buddyns.com.
 	IN	NS		f.ns.buddyns.com.
+	IN	NS		h.ns.buddyns.com.
 	IN	MX	10	smtp.maschezuoz.ch.
 	IN	TXT		"v=spf1 mx ip4:83.150.2.48/24 ~all"
 
diff --git a/config/obr/nsd-internal/zones/andreasbaumann.cc b/config/obr/nsd-internal/zones/andreasbaumann.cc
index 551675d..7cfb802 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. (
-				2016012400	; serial
+				2016071400	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
diff --git a/config/obr/nsd-internal/zones/project-strus.net b/config/obr/nsd-internal/zones/project-strus.net
index e9b238a..b72c90e 100644
--- a/config/obr/nsd-internal/zones/project-strus.net
+++ b/config/obr/nsd-internal/zones/project-strus.net
@@ -3,7 +3,7 @@
 $TTL 60
 
 @		IN	SOA	ns.project-strus.net. admin.project-strus.net. (
-				2016012800	; serial
+				2016031602	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -20,5 +20,9 @@ $ORIGIN project-strus.net.
 
 ns			A	192.168.1.1
 
-demo			A	192.168.1.15
-ellokal			A	192.168.1.15
+www			A	77.244.243.43
+;ellokal			A	192.168.1.15
+
+$ORIGIN .
+
+demo.project-strus.net CNAME   strus.selfhost.eu
diff --git a/config/obr/pf.conf b/config/obr/pf.conf
index 60d7075..eafedac 100644
--- a/config/obr/pf.conf
+++ b/config/obr/pf.conf
@@ -16,7 +16,8 @@ WLAN_if = athn0
 euroserver = 192.168.1.12
 eurodata = 192.168.1.9
 euroweb = 192.168.1.15
-	
+rpmaster = 192.168.1.253
+
 # our own networks
 table <intNetworks> const { 192.168.1.0/24 }
 
@@ -93,6 +94,8 @@ pass out on $int_if inet proto tcp to $eurodata port 21 user proxy
 pass in on $ext_if inet proto tcp to port 2121 divert-to 127.0.0.1 port 8022
 pass out on $int_if inet proto tcp to $euroserver port 2121 user proxy
 pass in on $ext_if proto tcp from any to port 2221 rdr-to $euroweb port 22   
+pass in on $ext_if proto tcp from any to port 2222 rdr-to $rpmaster port 22
 pass in on $ext_if proto tcp from any to port 2223 rdr-to $euroserver port 22
+pass in on $ext_if proto tcp from any to port 8080 rdr-to $euroserver port 8080
 pass in on $ext_if proto tcp from any to port 5900:5999 rdr-to $euroserver
 pass in on $ext_if proto tcp from any to port 6881:6889 rdr-to $euroserver