aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-17 13:35:57 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-17 13:35:57 -0200
commitd75effa11c00a960a15795f9b9b363869ed3da25 (patch)
treee7be4ab517504cc70af93def8c5214523640bed3
parent47b100f88da682b5c2e055ec175c2acce7d04551 (diff)
downloadpuppet-nodo-d75effa11c00a960a15795f9b9b363869ed3da25.tar.gz
puppet-nodo-d75effa11c00a960a15795f9b9b363869ed3da25.tar.bz2
Adding unzip package
-rw-r--r--manifests/init.pp13
-rw-r--r--manifests/utils.pp2
2 files changed, 13 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e4d3152..9e18a25 100644
--- 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 2ec62b1..e80d93a 100644
--- 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,
}
}