From b333a0ed2561256ff5a2af0cb0e46ea663ac647c Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Sat, 16 Jul 2011 16:39:16 -0400 Subject: Support FreeBSD for the puppet master The puppet master has one additional config file that needs to be placed in a different folder under FreeBSD. Signed-off-by: Gabriel Filion --- manifests/puppetmaster/base.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'manifests/puppetmaster') diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 6ac1e0c..820e499 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -5,7 +5,14 @@ class puppet::puppetmaster::base inherits puppet::base { "puppet:///modules/puppet/master/puppet.conf" ], } - if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } + # This is not in puppet::puppetmaster since we'd like for + # puppet::puppetmaster::cluster to work in FreeBSD too. + $puppet_default_config_dir = $operatingsystem ? { + freebsd => "/usr/local/etc/puppet", + default => "/etc/puppet", + } + + if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet_default_config_dir}/fileserver.conf" } file { "$puppet_fileserverconfig": source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf", -- cgit v1.2.3 From 000165503f79e6214047ba2622bdabf4176a68a0 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Tue, 23 Aug 2011 16:53:14 -0400 Subject: Move $puppet_default_config_dir to the puppet class We'd like to use this variable in the 'puppet' class since we're defining the path to another config file, there. Since puppet::puppetmaster inherits the puppet class, the variable will be defined appropriately. Just to make sure we get the value from the right place, let's also use the qualified variable name. To avoid useless repetitions in the variable name, change the variable name from $puppet_default_config_dir to $default_config_dir. Signed-off-by: Gabriel Filion --- manifests/puppetmaster/base.pp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'manifests/puppetmaster') diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 820e499..0000513 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -5,21 +5,14 @@ class puppet::puppetmaster::base inherits puppet::base { "puppet:///modules/puppet/master/puppet.conf" ], } - # This is not in puppet::puppetmaster since we'd like for - # puppet::puppetmaster::cluster to work in FreeBSD too. - $puppet_default_config_dir = $operatingsystem ? { - freebsd => "/usr/local/etc/puppet", - default => "/etc/puppet", - } - - if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet_default_config_dir}/fileserver.conf" } + if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet::default_config_dir}/fileserver.conf" } file { "$puppet_fileserverconfig": source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf", "puppet:///modules/site-puppet/master/fileserver.conf", "puppet:///modules/puppet/master/fileserver.conf" ], owner => root, group => puppet, mode => 640; - } + } if $puppetmaster_storeconfigs { include puppet::puppetmaster::storeconfigs -- cgit v1.2.3 From 4ebf3b82818427303d4d9d83daca8addcbc6f53c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 7 May 2011 20:37:08 +0200 Subject: Fix probable typos. --- manifests/puppetmaster/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/puppetmaster') diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 6ac1e0c..25709ea 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -20,7 +20,7 @@ class puppet::puppetmaster::base inherits puppet::base { if $puppetmaster_mode == 'passenger' { - include puppet::puppetmaster::pasenger + include puppet::puppetmaster::passenger File[$puppet_fileserverconfig]{ notify => Exec['notify_passenger_puppetmaster'], } -- cgit v1.2.3