diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:34:39 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:38:39 -0500 |
| commit | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (patch) | |
| tree | acd91c59fea86768f81d98e262ed1677f646fa47 /manifests/init.pp | |
| parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
| parent | 8584340c2aeac7d97a78b8303ab377b5049b80c2 (diff) | |
Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet
Conflicts:
files/master/config.ru
files/master/puppet.conf
manifests/base.pp
manifests/centos.pp
manifests/cron.pp
manifests/cron/base.pp
manifests/cron/linux.pp
manifests/debian.pp
manifests/init.pp
manifests/linux.pp
manifests/master/linux.pp
manifests/master/package/debian.pp
manifests/puppetmaster/base.pp
manifests/puppetmaster/centos.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/cleanup_reports.pp
manifests/puppetmaster/cleanup_reports/disable.pp
manifests/puppetmaster/debian.pp
manifests/puppetmaster/package.pp
manifests/puppetmaster/package/base.pp
manifests/puppetmaster/passenger.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 1943400..0667ba6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -12,25 +12,26 @@ # Marcel Haerry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # -# This program is free software; you can redistribute -# it and/or modify it under the terms of the GNU -# General Public License version 3 as published by +# This program is free software; you can redistribute +# it and/or modify it under the terms of the GNU +# General Public License version 3 as published by # the Free Software Foundation. # - -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 { +# Manage the puppet client +class puppet( + $config = '/etc/puppet/puppet.conf', + $config_content = false, + $http_compression = false, + $cleanup_clientbucket = false, + $ensure_version = 'installed', + $ensure_facter_version = 'installed', + $shorewall_puppetmaster = false, + $shorewall_puppetmaster_port = 8140, + $shorewall_puppetmaster_signport = 8141 +){ + case $::kernel { linux: { - case $operatingsystem { + case $::operatingsystem { gentoo: { include puppet::gentoo } centos: { include puppet::centos } debian,ubuntu: { include puppet::debian } @@ -38,11 +39,14 @@ class puppet { } } openbsd: { include puppet::openbsd } - freebsd: { include puppet::freebsd } default: { include puppet::base } } - if $use_shorewall { - include shorewall::rules::out::puppet + if $shorewall_puppetmaster { + class{'shorewall::rules::out::puppet': + puppetserver => $shorewall_puppetmaster, + puppetserver_port => $shorewall_puppetmaster_port, + puppetserver_signport => $shorewall_puppetmaster_signport, + } } } |