summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2016-09-12 17:10:41 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2016-09-12 17:10:41 +0200
commit4e36720a1f76d186d94dc6cedb4db27de4d6acb7 (patch)
treef0832543d4168ceed934785ac4889677efab25aa /config
parentf716b813ffa1c92e588075cdbff00705b328f404 (diff)
downloadOpenBSD-firewall-4e36720a1f76d186d94dc6cedb4db27de4d6acb7.tar.gz
OpenBSD-firewall-4e36720a1f76d186d94dc6cedb4db27de4d6acb7.tar.bz2
synchronized configuration
Diffstat (limited to 'config')
-rw-r--r--config/obr/nsd-external/zones/maschezuoz.ch2
-rw-r--r--config/obr/nsd-internal/etc/nsd.conf4
-rw-r--r--config/obr/nsd-internal/zones/maschezuoz.ch2
-rw-r--r--config/obr/pf.conf4
-rw-r--r--config/obr/unbound/etc/unbound.conf4
5 files changed, 3 insertions, 13 deletions
diff --git a/config/obr/nsd-external/zones/maschezuoz.ch b/config/obr/nsd-external/zones/maschezuoz.ch
index f9e7336..e9d62cf 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. (
- 2016062200 ; serial
+ 2016090301 ; serial
3h ; refresh
15m ; retry
2w ; expire
diff --git a/config/obr/nsd-internal/etc/nsd.conf b/config/obr/nsd-internal/etc/nsd.conf
index 87d4add..ab80444 100644
--- a/config/obr/nsd-internal/etc/nsd.conf
+++ b/config/obr/nsd-internal/etc/nsd.conf
@@ -39,7 +39,3 @@ zone:
zone:
name: "bikecentum.com"
zonefile: "bikecentum.com"
-
-zone:
- name: "project-strus.net"
- zonefile: "project-strus.net"
diff --git a/config/obr/nsd-internal/zones/maschezuoz.ch b/config/obr/nsd-internal/zones/maschezuoz.ch
index cc10a70..5772068 100644
--- a/config/obr/nsd-internal/zones/maschezuoz.ch
+++ b/config/obr/nsd-internal/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
$TTL 60
@ IN SOA ns.maschezuoz.ch. admin.maschezuoz.ch. (
- 2015100901 ; serial
+ 2016090500 ; serial
3h ; refresh
15m ; retry
2w ; expire
diff --git a/config/obr/pf.conf b/config/obr/pf.conf
index eafedac..51944a5 100644
--- a/config/obr/pf.conf
+++ b/config/obr/pf.conf
@@ -13,6 +13,7 @@ int_if = vr2
WLAN_if = athn0
# service machines
+europa1 = 192.168.1.2
euroserver = 192.168.1.12
eurodata = 192.168.1.9
euroweb = 192.168.1.15
@@ -93,9 +94,6 @@ pass in on $ext_if inet proto tcp to port 21 divert-to 127.0.0.1 port 8021
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
diff --git a/config/obr/unbound/etc/unbound.conf b/config/obr/unbound/etc/unbound.conf
index a8964fb..011419f 100644
--- a/config/obr/unbound/etc/unbound.conf
+++ b/config/obr/unbound/etc/unbound.conf
@@ -57,10 +57,6 @@ stub-zone:
name: "bikecentum.com."
stub-addr: 127.0.0.1@8053
-stub-zone:
- name: "project-strus.net."
- stub-addr: 127.0.0.1@8053
-
forward-zone:
name: "."
forward-addr: 194.246.118.118