Commit 8362fdd7 authored by Karl Kornel's avatar Karl Kornel
Browse files

os::ubuntu: Changes to daemontools

Only start daemontools in ubuntu 14.10 and below.  Also make sure daemontools is brough in before we need it.
parent 93e2869e
......@@ -8,14 +8,20 @@ class base::os::ubuntu inherits base::os::debian {
source => 'puppet:///modules/base/os/etc/apt/apt.conf.d/06apt';
'/etc/bash.bashrc':
source => 'puppet:///modules/base/os/etc/bash.bashrc';
'/etc/init/supervise.conf':
source => 'puppet:///modules/base/os/etc/init/supervise.conf',
notify => Exec['start supervise'];
}
# Triggered on Ubuntu to start the supervise process.
exec { 'start supervise':
command => '/sbin/start supervise',
refreshonly => true,
# Triggered on Ubuntu to start the supervise process. Only on 14.10 and below.
if ($::lsbmajdistrelease < 15) {
include base::daemontools
file {
'/etc/init/supervise.conf':
source => 'puppet:///modules/base/os/etc/init/supervise.conf',
notify => Exec['start supervise'],
}
exec { 'start supervise':
command => '/sbin/start supervise',
refreshonly => true,
require => Package['daemontools'],
}
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment