diff options
author | Michael Scherer <misc@mageia.org> | 2012-02-09 09:10:53 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-02-09 09:10:53 +0000 |
commit | 68b16519f3f82ef7d5b5b5e3d523fbc80b09dada (patch) | |
tree | cad65b5de79539e0f4171b82dda59d18d9fa87d3 | |
parent | 40adb562e51827278b6ccd937b7d3b62d9405e46 (diff) | |
download | puppet-68b16519f3f82ef7d5b5b5e3d523fbc80b09dada.tar puppet-68b16519f3f82ef7d5b5b5e3d523fbc80b09dada.tar.gz puppet-68b16519f3f82ef7d5b5b5e3d523fbc80b09dada.tar.bz2 puppet-68b16519f3f82ef7d5b5b5e3d523fbc80b09dada.tar.xz puppet-68b16519f3f82ef7d5b5b5e3d523fbc80b09dada.zip |
split puppet::master in a separate file, reindent it
and add a include for puppet::queue since that's needed
-rw-r--r-- | modules/puppet/manifests/init.pp | 37 | ||||
-rw-r--r-- | modules/puppet/manifests/master.pp | 38 |
2 files changed, 38 insertions, 37 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index c2e26794..7c8f2111 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -1,39 +1,2 @@ class puppet { - class master { - include puppet::client - - # rails and sqlite3 are used for stored config - package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: } - - service { puppetmaster: - subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] - } - - file { "/etc/puppet/extdata": - ensure => directory, - owner => puppet, - group => puppet, - mode => 700, - recurse => true - } - - file { '/etc/puppet/tagmail.conf': - content => template("puppet/tagmail.conf"), - } - - tidy { "/var/lib/puppet/reports": - age => "4w", - matches => "*.yaml", - recurse => true, - type => "mtime", - } - - file { "/etc/puppet/autosign.conf": - ensure => $environment ? { - 'test' => 'present', - default => 'absent', - }, - content => '*', - } - } } diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp new file mode 100644 index 00000000..243e8137 --- /dev/null +++ b/modules/puppet/manifests/master.pp @@ -0,0 +1,38 @@ +class puppet::master { + include puppet::client + include puppet::queue + + # rails and sqlite3 are used for stored config + package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: } + + service { puppetmaster: + subscribe => [ Package['puppet-server'], File['/etc/puppet/puppet.conf']] + } + + file { '/etc/puppet/extdata': + ensure => directory, + owner => puppet, + group => puppet, + mode => '0700', + recurse => true, + } + + file { '/etc/puppet/tagmail.conf': + content => template("puppet/tagmail.conf"), + } + + tidy { '/var/lib/puppet/reports': + age => "4w", + matches => "*.yaml", + recurse => true, + type => "mtime", + } + + file { '/etc/puppet/autosign.conf': + ensure => $environment ? { + 'test' => 'present', + default => 'absent', + }, + content => '*', + } +} |