Feat: major refactor

1 files changed, 7 insertions, 83 deletions

diff --git a/manifests/virtual/tor.pp b/manifests/virtual/tor.pp
index 7cca6d6..2b83151 100644
--- a/manifests/virtual/tor.pp
+++ b/manifests/virtual/tor.pp
@@ -1,85 +1,9 @@
-class firewall::virtual::tor($destination, $zone = 'vm') {
-  shorewall::rule { 'tor-0':
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9000",
-    proto           => 'tcp',
-    destinationport => '9000',
-    ratelimit       => '-',
-    order           => 2100,
-  }
-
-  shorewall::rule { 'tor-1':
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "fw:$destination:9000",
-    proto           => 'tcp',
-    destinationport => '9000',
-    originaldest    => lookup('firewall::external_ip', undef, undef, $::ipaddress),
-    ratelimit       => '-',
-    order           => 2101,
-  }
-
-  shorewall::rule { 'tor-2':
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9001",
-    proto           => 'tcp',
-    destinationport => '9001',
-    ratelimit       => '-',
-    order           => 2102,
-  }
-
-  shorewall::rule { 'tor-3':
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "fw:$destination:9001",
-    proto           => 'tcp',
-    destinationport => '9001',
-    originaldest    => lookup('firewall::external_ip', undef, undef, $::ipaddress),
-    ratelimit       => '-',
-    order           => 2103,
-  }
-
-  shorewall::rule { 'tor-4':
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9100",
-    proto           => 'tcp',
-    destinationport => '9100',
-    ratelimit       => '-',
-    order           => 2104,
-  }
-
-  shorewall::rule { 'tor-5':
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "fw:$destination:9100",
-    proto           => 'tcp',
-    destinationport => '9100',
-    originaldest    => lookup('firewall::external_ip', undef, undef, $::ipaddress),
-    ratelimit       => '-',
-    order           => 2105,
-  }
-
-  shorewall::rule { 'tor-6':
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9101",
-    proto           => 'tcp',
-    destinationport => '9101',
-    ratelimit       => '-',
-    order           => 2106,
-  }
-
-  shorewall::rule { 'tor-7':
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "fw:$destination:9101",
-    proto           => 'tcp',
-    destinationport => '9101',
-    originaldest    => lookup('firewall::external_ip', undef, undef, $::ipaddress),
-    ratelimit       => '-',
-    order           => 2107,
+class firewall::virtual::tor(
+  $implementation = lookup('firewall::implementation', undef, undef, 'shorewall'),
+  $destination, $zone = 'vm'
+) {
+  class { "firewall::implementations::${implementation}::virtual::tor":
+    destination => $destination,
+    zone        => $zone,
   }
 }