aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-05-29 20:09:56 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-05-29 20:09:56 -0300
commite980a351f0ff9060d7669fcfbda5c9d6c9890ced (patch)
tree9e3aafd425fe521397f9de768e752d262a6e1112 /manifests
parent90441dda16b1d62589e160f8a9aae2b3d37f9ee0 (diff)
downloadpuppet-nodo-e980a351f0ff9060d7669fcfbda5c9d6c9890ced.tar.gz
puppet-nodo-e980a351f0ff9060d7669fcfbda5c9d6c9890ced.tar.bz2
Don't use exim for mail tunnels
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodo.pp1
-rw-r--r--manifests/subsystems/tunnel.pp2
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index ae49ad4..75c472b 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -32,7 +32,6 @@ class nodo {
# Email delivery configuration
case $mail_delivery {
'tunnel': {
- include exim::disabled
tunnel::mail { "$mail_hostname":
sshport => "$mail_ssh_port",
}
diff --git a/manifests/subsystems/tunnel.pp b/manifests/subsystems/tunnel.pp
index 72c87f8..7bca56f 100644
--- a/manifests/subsystems/tunnel.pp
+++ b/manifests/subsystems/tunnel.pp
@@ -71,7 +71,7 @@ class tunnel {
tunnel::setup { "smtp":
host => "$name.$domain",
sshport => "$sshport",
- localport => '25',
+ localport => '2525',
hostport => '25',
}
}