From 51c7b390694d95e7096e33317de4242d67ca7e38 Mon Sep 17 00:00:00 2001 From: Keith aka fugit Date: Wed, 13 Apr 2011 10:35:57 -0400 Subject: updated allow insatll of puppetmaster on squeeze. This addresses the package diferences. --- manifests/puppetmaster/debian.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/puppetmaster/debian.pp') diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 8cee0ea..810c5a7 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,5 +1,6 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { + if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { -- cgit v1.2.3 From 9e820e4eddaa0b0f86f816dce974a648e0769c42 Mon Sep 17 00:00:00 2001 From: Keith aka fugit Date: Wed, 13 Apr 2011 10:49:45 -0400 Subject: removed errant space --- manifests/puppetmaster/debian.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'manifests/puppetmaster/debian.pp') diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 810c5a7..8cee0ea 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,6 +1,5 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { - if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { -- cgit v1.2.3 From 48affeddf6b343452e44cacd7b0d97295ba79a7b Mon Sep 17 00:00:00 2001 From: Keith aka fugit Date: Fri, 22 Apr 2011 10:50:27 -0400 Subject: Fix the notify call for puppet service so it will work with passenger --- manifests/puppetmaster/debian.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'manifests/puppetmaster/debian.pp') diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 8cee0ea..a7d7f0a 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -8,12 +8,19 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { } } + if $puppetmaster_mode == 'passenger' { + $puppetmaster_default_nofity = 'Exec[notify_passenger_puppetmaster]' + } + file { '/etc/default/puppetmaster': source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster", "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster", "puppet:///modules/site-puppet/master/debian/puppetmaster", "puppet:///modules/puppet/master/debian/puppetmaster" ], - notify => Service[puppetmaster], + notify => $puppetmaster_default_nofity ? { + '' => Service[puppetmaster], + default => Exec['notify_passenger_puppetmaster'] + }, owner => root, group => 0, mode => 0644; } } -- cgit v1.2.3 From dd380fa91507155d5cfe8ea87023903eb91a18b0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Jun 2012 22:58:41 -0400 Subject: 2.7 underscore rename: site-puppet --- manifests/puppetmaster/debian.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/puppetmaster/debian.pp') diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index a7d7f0a..0c81a64 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -13,9 +13,9 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { } file { '/etc/default/puppetmaster': - source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/puppetmaster", + source => [ "puppet:///modules/site_puppet/master/debian/${fqdn}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/${domain}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/puppetmaster", "puppet:///modules/puppet/master/debian/puppetmaster" ], notify => $puppetmaster_default_nofity ? { '' => Service[puppetmaster], -- cgit v1.2.3 From e761d31212a340a4c54f76d6308c42f569d4046d Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 15:10:26 -0400 Subject: remove no longer needed inheritance of puppet::puppetmaster::package as we are not doing any overrides, instead we can just include the classes that we also want to load --- manifests/puppetmaster/debian.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'manifests/puppetmaster/debian.pp') diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 0c81a64..f440ba3 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,5 +1,8 @@ -class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::debian { + include puppet::puppetmaster::package + include puppet::puppetmaster::linux + if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { -- cgit v1.2.3