From 09c8eaf304d1075980d8d9143545f2f16a1db34d Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 18:59:39 -0300
Subject: new style for 2.7

---
 manifests/master/package/base.pp   | 10 ++++++++++
 manifests/master/package/centos.pp |  7 +++++++
 manifests/master/package/debian.pp | 10 ++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 manifests/master/package/base.pp
 create mode 100644 manifests/master/package/centos.pp
 create mode 100644 manifests/master/package/debian.pp

(limited to 'manifests/master/package')

diff --git a/manifests/master/package/base.pp b/manifests/master/package/base.pp
new file mode 100644
index 0000000..0a1fa33
--- /dev/null
+++ b/manifests/master/package/base.pp
@@ -0,0 +1,10 @@
+class puppet::master::package::base inherits puppet::master::package {
+
+  package { 'puppetmaster':
+    ensure => $puppet::ensure_version,
+  }
+
+  Service['puppetmaster']{
+    require +> Package['puppetmaster'],
+  }
+}
diff --git a/manifests/master/package/centos.pp b/manifests/master/package/centos.pp
new file mode 100644
index 0000000..63adc64
--- /dev/null
+++ b/manifests/master/package/centos.pp
@@ -0,0 +1,7 @@
+class puppet::master::package::centos inherits puppet::master::package::base {
+
+  Package['puppetmaster']{
+    name => 'puppet-server',
+    alias => 'puppetmaster',
+  }
+}
diff --git a/manifests/master/package/debian.pp b/manifests/master/package/debian.pp
new file mode 100644
index 0000000..0cb351c
--- /dev/null
+++ b/manifests/master/package/debian.pp
@@ -0,0 +1,10 @@
+class puppet::master::package::debian inherits puppet::master::package::base {
+
+  package { 'puppetmaster-common':
+    ensure => present,
+  }
+
+  Package['puppetmaster']{
+    require => Package['puppetmaster-common']
+  }
+}
-- 
cgit v1.2.3


From 4fabfbd53cfb7c35cf7ad9ff03b6b38d4daed7b4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 20 May 2013 16:04:07 +0200
Subject: if it runs with passenger there is no such service

---
 manifests/master/package/base.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'manifests/master/package')

diff --git a/manifests/master/package/base.pp b/manifests/master/package/base.pp
index 0a1fa33..2851747 100644
--- a/manifests/master/package/base.pp
+++ b/manifests/master/package/base.pp
@@ -4,7 +4,9 @@ class puppet::master::package::base inherits puppet::master::package {
     ensure => $puppet::ensure_version,
   }
 
-  Service['puppetmaster']{
-    require +> Package['puppetmaster'],
+  if $puppet::master::mode != 'passenger' {
+    Service['puppetmaster']{
+      require +> Package['puppetmaster'],
+    }
   }
 }
-- 
cgit v1.2.3