diff options
| author | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
| commit | 24e4503906c5ffef236814b003d1fd629989fc40 (patch) | |
| tree | 1721fb6c2387d6cab5c6e6aaa9ab937b52c559f3 /manifests/cron.pp | |
| parent | 04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff) | |
| parent | ed7d89163385a6eab4423aae7ce8b5d994339a2f (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/cron.pp')
| -rw-r--r-- | manifests/cron.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/cron.pp b/manifests/cron.pp index 9a632ff..f593a00 100644 --- a/manifests/cron.pp +++ b/manifests/cron.pp @@ -1,11 +1,13 @@ -# manifests/cron.pp - class puppet::cron inherits puppet { case $operatingsystem { - linux: { include puppet::cron::linux } debian: { include puppet::cron::debian } openbsd: { include puppet::cron::openbsd } freebsd: { include puppet::cron::freebsd } - default: { include puppet::cron::base } + default: { + case $kernel { + linux: { include puppet::cron::linux } + default: { include puppet::cron::base } + } + } } } |