From faf3eed61c65f59fa7f7e99bf69d1a2f6c70d629 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 11:57:36 -0400 Subject: refactor puppet::puppetmaster::package --- manifests/puppetmaster/package.pp | 10 +++------- manifests/puppetmaster/package/base.pp | 11 +++++++++++ manifests/puppetmaster/package/centos.pp | 8 ++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 manifests/puppetmaster/package/base.pp create mode 100644 manifests/puppetmaster/package/centos.pp diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp index c91dbe8..c17c6f9 100644 --- a/manifests/puppetmaster/package.pp +++ b/manifests/puppetmaster/package.pp @@ -1,14 +1,10 @@ # manifests/puppetmaster/package.pp class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { + case $operatingsystem { - debian: { $puppetmaster_package="puppetmaster" } - default: { $puppetmaster_package="puppet-server" } + centos: { include puppet::puppetmaster::package::centos } + default: { include puppet::puppetmaster::package::base } } - package { $puppetmaster_package: ensure => present } - - Service[puppetmaster]{ - require +> Package[$puppetmaster_package], - } } diff --git a/manifests/puppetmaster/package/base.pp b/manifests/puppetmaster/package/base.pp new file mode 100644 index 0000000..1eb9302 --- /dev/null +++ b/manifests/puppetmaster/package/base.pp @@ -0,0 +1,11 @@ +class puppet::puppetmaster::package::base inherits puppet::puppetmaster::package { + + package { 'puppetmaster': + ensure => present, + } + + Service['puppetmaster']{ + require +> Package['puppetmaster'], + } + +} diff --git a/manifests/puppetmaster/package/centos.pp b/manifests/puppetmaster/package/centos.pp new file mode 100644 index 0000000..f6470ec --- /dev/null +++ b/manifests/puppetmaster/package/centos.pp @@ -0,0 +1,8 @@ +class puppet::puppetmaster::package::centos inherits puppet::puppetmaster::package::base { + + Package['puppetmaster'] { + name => 'puppet-server', + alias => 'puppetmaster', + } + +} -- cgit v1.2.3 From 4b1787ecc126798dcbcf85d383b0489f56dd34bf Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 12:00:37 -0400 Subject: storeconfigs: use new mysql::client::ruby class --- manifests/puppetmaster/storeconfigs.pp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/manifests/puppetmaster/storeconfigs.pp b/manifests/puppetmaster/storeconfigs.pp index 1b6d759..a3b09bd 100644 --- a/manifests/puppetmaster/storeconfigs.pp +++ b/manifests/puppetmaster/storeconfigs.pp @@ -1,13 +1,10 @@ # This class sets up the necessary ActiveRecord bits # so storeconfigs works. + class puppet::puppetmaster::storeconfigs { + include rails include mysql::server - - case $operatingsystem { - debian: { package { libmysql-ruby: ensure => present } } - - } - + include mysql::client::ruby } -- cgit v1.2.3 From 5c158f06292d8b15cbe08d43ee36b08c30048569 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 15:56:30 -0400 Subject: adapt puppet::puppetmaster::passenger to updated passenger module --- manifests/puppetmaster/passenger.pp | 46 +++++++++++-------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp index 06e2a2b..636c135 100644 --- a/manifests/puppetmaster/passenger.pp +++ b/manifests/puppetmaster/passenger.pp @@ -1,45 +1,27 @@ # class to use passenger for serving puppetmaster -class puppet::puppetmaster::passenger { - - case $operatingsystem { - debian: { include puppet::puppetmaster::passenger::debian } - defaults: { notice ( "class puppet::puppetmaster::passenger::base needs to be configured for using passenger with non-debian OS !" ) - include puppet::puppetmaster::passenger::base } - } -} - -class puppet::puppetmaster::passenger::debian inherits puppet::puppetmaster::passenger::base { - # according to http://github.com/reductivelabs/puppet/tree/master/ext/rack rack needs - # to be version >= 1.0.0 . lenny-backports provide it - package { "librack-ruby": ensure => "1.0.0-2~bpo50+1" } - package { "librack-ruby1.8": ensure => "1.0.0-2~bpo50+1" } - - apache::config::global{ 'puppet-apache2-passenger.conf': } - apache::debian::module { 'ssl': ensure => present } - apache::debian::module { 'passenger': ensure => present } - apache::debian::module { 'headers': ensure => present } -} +class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base { -class puppet::puppetmaster::passenger::base { - - include apache - include passenger::apache - + include passenger + # A reference configuration is available at : # http://github.com/reductivelabs/puppet/tree/master/ext/rack - file { ["/etc/puppet/rack", "/etc/puppet/rack/public"]: + + file { ['/etc/puppet/rack', '/etc/puppet/rack/public']: ensure => directory, - mode => 0755, owner => root, - group => root, + group => 0, + mode => 0755, } + file { "/etc/puppet/rack/config.ru": ensure => present, - source => "puppet:///modules/puppet/master/config.ru", - mode => 0644, + source => [ "puppet://${server}/modules/site-puppet/master/config.ru", + "puppet://${server}/modules/puppet/master/config.ru", + ], owner => puppet, - group => root, + group => 0, + mode => 0644, } -} +} -- cgit v1.2.3 From 80ad4d09e674b44e096f21c5713f355d31b16f1d Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 16:25:29 -0400 Subject: remove package name override, not needed anymore --- manifests/puppetmaster/debian.pp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 20ac997..bcbee9b 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,11 +1,4 @@ # manifests/puppetmaster/debian.pp class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { - - Package['puppet-server'] { - name => 'puppetmaster', - alias => 'puppet-server', - } - } - -- cgit v1.2.3 From 1e27b543c8175a501ee61222797be30b949f1ad3 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 16:28:46 -0400 Subject: depend on cron module --- manifests/linux.pp | 3 ++- manifests/puppetmaster/checklastrun.pp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/linux.pp b/manifests/linux.pp index 4190b85..3a79e34 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -24,11 +24,12 @@ class puppet::linux inherits puppet::base { require => Package[puppet], } + include cron file{'/etc/cron.d/puppetd.cron': source => [ "puppet://$server/modules/puppet/cron.d/puppetd.${operatingsystem}", "puppet://$server/modules/puppet/cron.d/puppetd" ], owner => root, group => 0, mode => 0644, - notify => service["crond"]; + notify => service["cron"]; } } diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index fdcc096..0c0126d 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -8,6 +8,6 @@ class puppet::puppetmaster::checklastrun { content => "40 10,22 * * * root /usr/local/bin/puppetlast\n", require => File["/usr/local/bin/puppetlast"], owner => root, group => 0, mode => 0644, - notify => service["crond"]; + notify => service["cron"]; } } -- cgit v1.2.3 From 04f62c810f14599fb935dee962689b2727d54c36 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 16:47:29 -0400 Subject: rename $puppet_version and $facter_version and default to installed instead of present --- manifests/linux.pp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/manifests/linux.pp b/manifests/linux.pp index 3a79e34..f367f83 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -1,21 +1,13 @@ class puppet::linux inherits puppet::base { - $real_puppet_version = $puppet_version ? { - '' => 'present', - default => $puppet_version, - } - - $real_facter_version = $facter_version ? { - '' => 'present', - default => $facter_version, - } - + if $puppet_ensure_version == '' { $puppet_ensure_version = 'installed' } package{ 'puppet': - ensure => $real_puppet_version, + ensure => $puppet_ensure_version, } - + + if $facter_ensure_version == '' { $facter_ensure_version = 'installed' } package{ 'facter': - ensure => $real_facter_version, + ensure => $facter_ensure_version, } # package bc needed for cron -- cgit v1.2.3 From 834f6a89287a2d26e20fe57946fe0bf31909daa1 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 17:09:17 -0400 Subject: correct typo (do we really need to notify cron?) --- manifests/linux.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/linux.pp b/manifests/linux.pp index f367f83..ebbedcb 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -22,6 +22,6 @@ class puppet::linux inherits puppet::base { source => [ "puppet://$server/modules/puppet/cron.d/puppetd.${operatingsystem}", "puppet://$server/modules/puppet/cron.d/puppetd" ], owner => root, group => 0, mode => 0644, - notify => service["cron"]; + notify => Service['cron']; } } -- cgit v1.2.3 From 3942522b20256cf5e76118d2888917247352e388 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 12 May 2010 18:18:45 -0400 Subject: need to specify root namespace --- manifests/puppetmaster/passenger.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp index 636c135..244e2bb 100644 --- a/manifests/puppetmaster/passenger.pp +++ b/manifests/puppetmaster/passenger.pp @@ -2,7 +2,7 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base { - include passenger + include ::passenger # A reference configuration is available at : # http://github.com/reductivelabs/puppet/tree/master/ext/rack -- cgit v1.2.3 From 79cc286c7249e39f633f422390b5ab79d72f89dd Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 13 May 2010 10:14:53 -0400 Subject: fix include namespaces --- manifests/linux.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/linux.pp b/manifests/linux.pp index ebbedcb..f9e2ea6 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -10,13 +10,13 @@ class puppet::linux inherits puppet::base { ensure => $facter_ensure_version, } - # package bc needed for cron + # package bc needed for cron job include bc Service['puppet']{ require => Package[puppet], } - include cron + include ::cron file{'/etc/cron.d/puppetd.cron': source => [ "puppet://$server/modules/puppet/cron.d/puppetd.${operatingsystem}", -- cgit v1.2.3