diff options
author | Michael Scherer <misc@mageia.org> | 2012-01-08 22:24:51 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-01-08 22:24:51 +0000 |
commit | f4f01178591b8bcd64277889c63c4d1801c2b0c0 (patch) | |
tree | a5adf349885858f6a0356a704dc891e1983d1da5 /modules | |
parent | af29bf33a6466aa2742f4229008ca6fb543d5eb4 (diff) | |
download | puppet-f4f01178591b8bcd64277889c63c4d1801c2b0c0.tar puppet-f4f01178591b8bcd64277889c63c4d1801c2b0c0.tar.gz puppet-f4f01178591b8bcd64277889c63c4d1801c2b0c0.tar.bz2 puppet-f4f01178591b8bcd64277889c63c4d1801c2b0c0.tar.xz puppet-f4f01178591b8bcd64277889c63c4d1801c2b0c0.zip |
cleaning of puppet module
Diffstat (limited to 'modules')
-rw-r--r-- | modules/puppet/manifests/init.pp | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index 770c8247..efef3eec 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -1,16 +1,9 @@ class puppet { class client { - package { puppet: - ensure => installed - } + package { puppet: } - file { "puppet.conf": - path => "/etc/puppet/puppet.conf", - ensure => present, - owner => root, - group => root, - mode => 644, + file { "/etc/puppet/puppet.conf": content => template("puppet/puppet.conf"), require => Package[puppet] } @@ -22,16 +15,13 @@ class puppet { ensure => present, } - service { puppet: - enable => false, - hasstatus => true, - } + service { puppet: + enable => false, + hasstatus => true, + } } class master inherits client { - package { puppet-server: - ensure => installed - } # for stored config $rails_package = $lsbdistid ? { @@ -39,9 +29,7 @@ class puppet { MandrivaLinux => "rails" } - package { ["ruby-sqlite3",$rails_package]: - ensure => installed - } + package { ["ruby-sqlite3", "puppet-server", $rails_package]: } service { puppetmaster: ensure => running, @@ -49,8 +37,7 @@ class puppet { subscribe => [ Package[puppet-server], File["puppet.conf"]] } - file { "extdata": - path => "/etc/puppet/extdata", + file { "/etc/puppet/extdata": ensure => directory, owner => puppet, group => puppet, @@ -59,10 +46,6 @@ class puppet { } file { '/etc/puppet/tagmail.conf': - ensure => present, - owner => root, - group => root, - mode => 644, content => template("puppet/tagmail.conf"), } |