aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2015-06-18 17:01:01 -0400
committerAntoine Beaupré <anarcat@koumbit.org>2015-06-18 17:15:28 -0400
commit6ea0beb114cdb836cfe9b3ef67504f3641c518ca (patch)
tree834edec8212964e2c96818acb18f15f420f0da6a /manifests
parent7b99c89edf698d295dc21aba97800166c7961cf9 (diff)
downloadpuppet-sshd-6ea0beb114cdb836cfe9b3ef67504f3641c518ca.tar.gz
puppet-sshd-6ea0beb114cdb836cfe9b3ef67504f3641c518ca.tar.bz2
disable autossh control port
this is important to make it easier to guess the ssh port from the central server. we rely on ServerAliveInterval instead to reconnect when we lose the server. this was unintentionally removed in november 2012 in the isuma-autossh package, saying it was "not supported everywhere" and due to some confusion about the defaults (defaults are to *enable* the port). see commit ec0ebdd9533a29ee4f62f9fbb84ee9e80219ef84 in there.
Diffstat (limited to 'manifests')
-rw-r--r--manifests/autossh.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/autossh.pp b/manifests/autossh.pp
index 1ded7eb..5650584 100644
--- a/manifests/autossh.pp
+++ b/manifests/autossh.pp
@@ -23,7 +23,7 @@ class sshd::autossh($host,
source => 'puppet:///modules/sshd/autossh.init.d';
'/etc/default/autossh':
mode => '0444',
- content => "USER=$user\nPIDFILE=$pidfile\nDAEMON_ARGS='-f -o ServerAliveInterval=15 -o ServerAliveCountMax=4 -q -N -R $port_ensure:localhost:22 $remote_user_ensure@$host'\n";
+ content => "USER=$user\nPIDFILE=$pidfile\nDAEMON_ARGS='-M0 -f -o ServerAliveInterval=15 -o ServerAliveCountMax=4 -q -N -R $port_ensure:localhost:22 $remote_user_ensure@$host'\n";
}
package { 'autossh':
ensure => present,