diff options
| -rw-r--r-- | manifests/puppetmaster.pp | 24 | ||||
| -rw-r--r-- | manifests/puppetmaster/cluster.pp | 23 |
2 files changed, 25 insertions, 22 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp index 750f759..dd0f800 100644 --- a/manifests/puppetmaster.pp +++ b/manifests/puppetmaster.pp @@ -24,7 +24,8 @@ class puppet::puppetmaster inherits puppet { } file { "$real_puppet_fileserverconfig": - source => [ "puppet://$server/files/puppet/master/fileserver.conf", + source => [ "puppet://$server/files/puppet/master/${fqdn}/fileserver.conf", + "puppet://$server/files/puppet/master/fileserver.conf", "puppet://$server/puppet/master/fileserver.conf" ], notify => [Service[puppet],Service[puppetmaster] ], owner => root, group => 0, mode => 600; @@ -63,27 +64,6 @@ class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { } } -class puppet::puppetmaster::cluster inherits puppet::puppetmaster { - include mongrel, nginx - - Service[puppetmaster]{ - require +> Service[ngnix], - } - - File[puppet_config] { - require => [ Package[mongrel], Package[nginx], File[nginx_config] ], - } - - case $operatingsystem { - gentoo, centos: { - file{"/etc/init.d/puppetmaster": - source => "puppet://$server/puppet/init.d/puppetmaster.${operatingsystem}", - owner => root, group => 0, mode => 0755; - } - } - } -} - define puppet::puppetmaster::hasdb( $dbtype = 'mysql', $dbname = 'puppet', diff --git a/manifests/puppetmaster/cluster.pp b/manifests/puppetmaster/cluster.pp new file mode 100644 index 0000000..915c8a4 --- /dev/null +++ b/manifests/puppetmaster/cluster.pp @@ -0,0 +1,23 @@ +# manifests/puppetmaster/cluster.pp + +class puppet::puppetmaster::cluster inherits puppet::puppetmaster { + include mongrel, nginx + + Service[puppetmaster]{ + require +> Service[ngnix], + } + + File[puppet_config] { + require => [ Package[mongrel], Package[nginx], File[nginx_config] ], + } + + case $operatingsystem { + gentoo, centos: { + file{"/etc/init.d/puppetmaster": + source => "puppet://$server/puppet/init.d/puppetmaster.${operatingsystem}", + owner => root, group => 0, mode => 0755; + } + } + } +} + |