Adding unzip package

diff --git a/manifests/init.pp b/manifests/init.pp
index e4d3152a327f74cb40ed577479cb0c82ec7529f8..9e18a2560482d9ccfe3adc2c9320ed298df073dd 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -257,7 +257,7 @@ class nodo::vserver inherits nodo {
     case $ensure {
       'running': {
 
-        shorewall::rule { "ssh-$context":
+        shorewall::rule { "ssh-$context-1":
           action          => 'DNAT',
           source          => 'net',
           destination     => "vm:192.168.0.$context:22",
@@ -267,6 +267,17 @@ class nodo::vserver inherits nodo {
           order           => "2$id",
         }
 
+        shorewall::rule { "ssh-$context-2":
+          action          => 'DNAT',
+          source          => '$FW',
+          destination     => "fw:192.168.0.$context:22",
+          proto           => 'tcp',
+          destinationport => '8140',
+          originaldest    => "$ipaddress",
+          ratelimit       => '-',
+          order           => '304',
+        }
+
         if $proxy {
           shorewall::rule { 'http-route':
             action          => 'DNAT',

diff --git a/manifests/utils.pp b/manifests/utils.pp
index 2ec62b1b2a13cc7928b0aa829d4e85de14f6478a..e80d93a4a650958d634b9ac716aa38d7b6f86a3a 100644 (file)
--- a/manifests/utils.pp
+++ b/manifests/utils.pp
@@ -1,6 +1,6 @@
 # Common utilities
 class utils {
-  package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'wget' ]:
+  package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'wget', 'unzip' ]:
     ensure => installed,
   }
 }