diff options
| author | mh <mh@immerda.ch> | 2012-06-10 16:20:01 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-10 16:20:01 -0300 |
| commit | a83290235e9da22d05de814b22e265f53a0dc6bb (patch) | |
| tree | 1e2b79416eb1f3c66a03773e1148ddee8aa026c0 | |
| parent | 09c8eaf304d1075980d8d9143545f2f16a1db34d (diff) | |
use proper variable name
| -rw-r--r-- | manifests/master.pp | 1 | ||||
| -rw-r--r-- | manifests/master/base.pp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 5ca0acc..2e3029f 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,6 +1,7 @@ # manifests/puppetmaster.pp class puppet::master( $config = hiera('puppet_config','/etc/puppet/puppet.conf'), + $fileserver = hiera('puppet_fileserver_config','/etc/puppet/fileserver.conf'), $http_compression = hiera('puppet_http_compression',false), $cleanup_clientbucket = hiera('puppet_cleanup_clientbucket',false), $cron_time = hiera('puppet_cron_time',false), diff --git a/manifests/master/base.pp b/manifests/master/base.pp index 80fe8e0..6e8efe4 100644 --- a/manifests/master/base.pp +++ b/manifests/master/base.pp @@ -1,6 +1,6 @@ class puppet::master::base inherits puppet::base { - file { $puppet::master::fileserverconfig: + file { $puppet::master::fileserver: source => [ "puppet:///modules/site_puppet/master/${::fqdn}/fileserver.conf", "puppet:///modules/site_puppet/master/fileserver.conf", "puppet:///modules/puppet/master/fileserver.conf" ], @@ -14,14 +14,14 @@ class puppet::master::base inherits puppet::base { if $puppet::master::mode == 'passenger' { include puppet::master::passenger - File[$puppet::master::fileserverconfig]{ + File[$puppet::master::fileserver]{ notify => Exec['notify_passenger_puppetmaster'], } File[puppet_config]{ notify => Exec['notify_passenger_puppetmaster'], } } else { - File[$puppet::master::fileserverconfig]{ + File[$puppet::master::fileserver]{ notify => Service[puppetmaster], } File[puppet_config]{ |