Don't use exim for mail tunnels

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index ae49ad4fb40a89dca25b41fcd1d851d3c2d1a620..75c472b9732bcbfe6233c55d93af798bb756add0 100644 (file)
--- 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 72c87f8cc1ae6475a3e520a48a6a5a4be345dc3d..7bca56f263f58e455c4fad1f5c77f7f643cb8b30 100644 (file)
--- 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',
     }
   }