Feat: major refactor

1 files changed, 8 insertions, 83 deletions

diff --git a/manifests/router/tor.pp b/manifests/router/tor.pp
index cf5cc58..b93ea05 100644
--- a/manifests/router/tor.pp
+++ b/manifests/router/tor.pp
@@ -1,85 +1,10 @@
-define firewall::router::tor($destination, $zone = 'loc', $originaldest = $ipaddress) {
-  shorewall::rule { "tor-$name-1":
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9000",
-    proto           => 'tcp',
-    destinationport => "9000",
-    ratelimit       => '-',
-    order           => "29000",
-  }
-
-  shorewall::rule { "tor-$name-2":
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "$zone:$destination:9000",
-    proto           => 'tcp',
-    destinationport => "9000",
-    originaldest    => "$originaldest",
-    ratelimit       => '-',
-    order           => "29000",
-  }
-
-  shorewall::rule { "tor-$name-3":
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9001",
-    proto           => 'tcp',
-    destinationport => "9001",
-    ratelimit       => '-',
-    order           => "29001",
-  }
-
-  shorewall::rule { "tor-$name-4":
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "$zone:$destination:9001",
-    proto           => 'tcp',
-    destinationport => "9001",
-    originaldest    => "$originaldest",
-    ratelimit       => '-',
-    order           => "29001",
-  }
-
-  shorewall::rule { "tor-$name-5":
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9100",
-    proto           => 'tcp',
-    destinationport => "9100",
-    ratelimit       => '-',
-    order           => "29100",
-  }
-
-  shorewall::rule { "tor-$name-6":
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "$zone:$destination:9100",
-    proto           => 'tcp',
-    destinationport => "9100",
-    originaldest    => "$originaldest",
-    ratelimit       => '-',
-    order           => "29100",
-  }
-
-  shorewall::rule { "tor-$name-7":
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => "$zone:$destination:9101",
-    proto           => 'tcp',
-    destinationport => "9101",
-    ratelimit       => '-',
-    order           => "29101",
-  }
-
-  shorewall::rule { "tor-$name-8":
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => "$zone:$destination:9101",
-    proto           => 'tcp',
-    destinationport => "9101",
-    originaldest    => "$originaldest",
-    ratelimit       => '-',
-    order           => "29101",
+define firewall::router::tor(
+  $implementation = lookup('firewall::implementation', undef, undef, 'shorewall'),
+  $destination, $zone = 'loc', $originaldest = $ipaddress
+) {
+  class { "firewall::implementations::${implementation}::router::tor":
+    destination  => $destination,
+    zone         => $zone,
+    originaldest => $originaldest,
   }
 }