summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-10-27 17:00:39 -0400
committerMicah Anderson <micah@riseup.net>2008-10-27 17:00:39 -0400
commit6fb10939afd72a8e1243681f1ae9062abf0975fa (patch)
treed0abee7aec03549ec49072b90d277562ce7d7012
parent49d840dab4c7cfeff8ca21d1ef0728832046f205 (diff)
In debian, the daemon is run as 'sshd', but the initscript is
/etc/init.d/ssh, which means that name needs to be set to 'ssh', and pattern needs to be set to 'sshd', and then we set the hassstatus and hasrestart depending on the lsbdistcodename
-rw-r--r--manifests/init.pp7
1 files changed, 4 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 32b7109..1ac65f5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -254,7 +254,7 @@ class sshd::debian inherits sshd::linux {
name => 'openssh-server',
}
- $ssh_hasrestart = $lsbdistcodename ? {
+ $sshd_restartandstatus = $lsbdistcodename ? {
etch => false,
lenny => true,
default => false
@@ -262,8 +262,9 @@ class sshd::debian inherits sshd::linux {
Service[sshd]{
name => 'ssh',
- hasstatus => true,
- hasrestart => $ssh_hasrestart,
+ pattern => 'sshd',
+ hasstatus => $sshd_restartandstatus,
+ hasrestart => $sshd_restartandstatus,
}
}
class sshd::ubuntu inherits sshd::debian {}