Changeset 10715 in genesis

Timestamp:

May 7, 2012, 9:11:53 PM (13 years ago)

Author:

rick

Message:

Denk je net alles gehad te hebben, komt er iemand die UDP wilt ;-).

Tevens de reeds bekende redirects in de config files gezet.

Related-To: nodefactory#152

Files:

• nodes/HybridRick2/wleiden.yaml (modified) (1 diff)
• nodes/HybridRund/wleiden.yaml (modified) (1 diff)
• nodes/HybridWBRotary/wleiden.yaml (modified) (1 diff)
• tools/gformat.py (modified) (1 diff)

nodes/HybridRick2/wleiden.yaml

@@ -20 +20 @@
 rdr_host: "riff.vanderzwet.net"
 rdr_rules :
-- [9080, '172.17.0.41', 80]
-- [9081, '172.17.0.42', 80]
-- [9082, '172.17.0.43', 80]
-- [9083, '172.17.0.44', 80]
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 80]
+- ['tcp', 9082, '172.17.0.43', 80]
+- ['tcp', 9083, '172.17.0.44', 80]
 remote_access: "riff.vanderzwet.net:2022"
 

nodes/HybridRund/wleiden.yaml

@@ -19 +19 @@
 service_proxy_normal: True
 status    : "up"
+rdr_host: "83.163.239.115"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 80]
+- ['tcp', 9082, '172.17.0.43', 80]
+- ['tcp', 9083, '172.17.0.44', 80]
 
 

nodes/HybridWBRotary/wleiden.yaml

@@ -20 +20 @@
 service_proxy_normal: True
 status    : "up"
+rdr_host: "94.209.113.8"
+rdr_rules :
+- ['tcp', 21, '172.17.0.45', 21]
+- ['tcp', 84, '172.17.0.41', 80]
+- ['tcp', 85, '172.17.0.42', 80]
+- ['tcp', 86, '172.17.0.43', 80]
+- ['tcp', 87, '172.17.0.44', 80]
+- ['tcp', 554, '172.17.0.43', 554]
+- ['udp', 1194, '172.19.128.68', 1194]
+- ['tcp', 3389, '172.17.0.45', 3389]
 
 

tools/gformat.py

@@ -796 +796 @@
 # Redirect some internal facing services outside (7)
 # INFO: {{ rdr_rules|count }} rdr_rules (outside to internal redirect rules) defined.
-{% for src_port,dest_ip,dest_port in rdr_rules -%}
-rdr on $ext_if inet proto tcp from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }}
+{% for protocol, src_port,dest_ip,dest_port in rdr_rules -%}
+rdr on $ext_if inet proto {{ protocol }} from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }}
 {% endfor -%}
 """).render(datadump)