diff options
| author | Micah Anderson <micah@riseup.net> | 2012-04-12 15:35:03 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-04-12 15:35:03 -0400 |
| commit | dffec4d8134be8a2eb2bb3a8063b2d60d67308f1 (patch) | |
| tree | 4b78702a3c720b3f73a005c738dc90aac1e136d1 /manifests/init.pp | |
| parent | 4ebf3b82818427303d4d9d83daca8addcbc6f53c (diff) | |
| parent | 506767d73515f79e05057df928bf7baa94b0dfcc (diff) | |
Merge remote-tracking branch 'lelutin/freebsd' into shared
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e9d9748..c05631a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -19,8 +19,17 @@ # class puppet { + $default_config_dir = $operatingsystem ? { + freebsd => "/usr/local/etc/puppet", + default => "/etc/puppet", + } + + $puppet_default_config = "$default_config_dir/puppet.conf" + + if $puppet_config == '' { $puppet_config = $puppet_default_config } + case $kernel { - linux: { + linux: { case $operatingsystem { gentoo: { include puppet::gentoo } centos: { include puppet::centos } @@ -29,6 +38,7 @@ class puppet { } } openbsd: { include puppet::openbsd } + freebsd: { include puppet::freebsd } default: { include puppet::base } } |