tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial fixes for puppet::server to support ubuntu.

Browse source
This commit is contained in:
Timo Mkinen 2010-10-22 22:47:29 +03:00
parent c7bc043522
commit da62c69819
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
puppet/manifests/init.pp
View file

@ -127,7 +127,11 @@ class puppet::server inherits puppet::client {
} }
} }
package { "puppet-server": package { "puppetmaster":
name => $operatingsystem ? {
ubuntu => "puppetmaster",
default => "puppet-server",
},
ensure => installed, ensure => installed,
} }
@ -139,11 +143,11 @@ class puppet::server inherits puppet::client {
} }
include mongrel include mongrel
include ldap::client::ruby
package { [ "rubygem-rails", package { [ "rubygem-rails",
"rubygem-sqlite3-ruby", "rubygem-sqlite3-ruby",
"ruby-RRDtool", "ruby-RRDtool", ]:
"ruby-ldap", ]:
ensure => installed, ensure => installed,
} }
@ -175,7 +179,7 @@ class puppet::server inherits puppet::client {
owner => puppet, owner => puppet,
group => puppet, group => puppet,
require => [ File["/srv/puppet"], require => [ File["/srv/puppet"],
Package["puppet-server"], ], Package["puppetmaster"], ],
before => Service["puppetmaster"], before => Service["puppetmaster"],
} }
} }
@ -187,7 +191,7 @@ class puppet::server inherits puppet::client {
owner => puppet, owner => puppet,
group => puppet, group => puppet,
require => [ File["/srv/puppet"], require => [ File["/srv/puppet"],
Package["puppet-server"], ], Package["puppetmaster"], ],
before => Service["puppetmaster"], before => Service["puppetmaster"],
} }
file { "/srv/puppet/files": file { "/srv/puppet/files":
@ -212,7 +216,7 @@ class puppet::server inherits puppet::client {
owner => root, owner => root,
group => puppet, group => puppet,
require => [ File["/srv/puppet/files"], require => [ File["/srv/puppet/files"],
Package["puppet-server"], ], Package["puppetmaster"], ],
before => Service["puppetmaster"], before => Service["puppetmaster"],
} }
@ -220,7 +224,7 @@ class puppet::server inherits puppet::client {
ensure => running, ensure => running,
enable => true, enable => true,
hasstatus => true, hasstatus => true,
require => Package["puppet-server"], require => Package["puppetmaster"],
subscribe => File["/etc/puppet/puppet.conf"], subscribe => File["/etc/puppet/puppet.conf"],
} }
@ -236,7 +240,7 @@ class puppet::server inherits puppet::client {
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
require => Package["puppet-server"], require => Package["puppetmaster"],
} }
file { "/etc/puppet/fileserver.conf": file { "/etc/puppet/fileserver.conf":
@ -247,10 +251,12 @@ class puppet::server inherits puppet::client {
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
require => Package["puppet-server"], require => Package["puppetmaster"],
notify => Service["puppetmaster"], notify => Service["puppetmaster"],
} }
case $operatingsystem {
fedora,centos: {
file { "/etc/sysconfig/puppetmaster": file { "/etc/sysconfig/puppetmaster":
ensure => present, ensure => present,
content => template("puppet/puppetmaster.sysconfig.erb"), content => template("puppet/puppetmaster.sysconfig.erb"),
@ -259,6 +265,8 @@ class puppet::server inherits puppet::client {
group => root, group => root,
notify => Service["puppetmaster"], notify => Service["puppetmaster"],
} }
}
}
if !$puppet_report_maxage { if !$puppet_report_maxage {
$puppet_report_maxage = "720" $puppet_report_maxage = "720"