From 7b99c89edf698d295dc21aba97800166c7961cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Thu, 18 Jun 2015 16:43:17 -0400
Subject: make autossh fork properly

---
 manifests/autossh.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/autossh.pp b/manifests/autossh.pp
index fadc575..1ded7eb 100644
--- a/manifests/autossh.pp
+++ b/manifests/autossh.pp
@@ -1,7 +1,8 @@
 class sshd::autossh($host,
-              $port = undef, # this should be a remote->local hash
-              $remote_user = undef,
-              $user = 'root',
+                    $port = undef, # this should be a remote->local hash
+                    $remote_user = undef,
+                    $user = 'root',
+                    $pidfile = '/var/run/autossh.pid',
 ) {
   if $port {
     $port_ensure = $port
@@ -22,7 +23,7 @@ class sshd::autossh($host,
       source => 'puppet:///modules/sshd/autossh.init.d';
     '/etc/default/autossh':
       mode    => '0444',
-      content => "USER=$user\nDAEMON_ARGS='-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='-f -o ServerAliveInterval=15 -o ServerAliveCountMax=4 -q -N -R $port_ensure:localhost:22 $remote_user_ensure@$host'\n";
   }
   package { 'autossh':
     ensure => present,
-- 
cgit v1.2.3