From 8d61ad7c8a76adf378a319245d655cf0fce18d25 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 12 Feb 2012 15:43:28 +0100
Subject: manage selinux stuff

---
 manifests/init.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index c6b24a8..db1a077 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,7 +19,7 @@
 # $apache_default_group: Set this to the group with which the
 #                        apache is running.
 class apache {
-  case $operatingsystem {
+  case $::operatingsystem {
     centos: { include apache::centos }
     gentoo: { include apache::gentoo }
     debian: { include apache::debian }
@@ -27,10 +27,10 @@ class apache {
     openbsd: { include apache::openbsd }
     default: { include apache::base }
   }
-  if $use_munin {
+  if hiera('use_munin',false) {
     include apache::status
   }
-  if $use_shorewall {
+  if hiera('use_shorewall',false) {
     include shorewall::rules::http
   }
 }
-- 
cgit v1.2.3


From 076909377eaa3aa41936e3acb7e02a9b5b14d493 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 31 May 2012 11:38:45 +0200
Subject: fix various puppet language things

---
 manifests/init.pp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index db1a077..a471591 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,9 +6,9 @@
 # Marcel Härry haerry+puppet(at)puzzle.ch
 # Simon Josi josi+puppet(at)puzzle.ch
 #
-# This program is free software; you can redistribute 
-# it and/or modify it under the terms of the GNU 
-# General Public License version 3 as published by 
+# This program is free software; you can redistribute
+# it and/or modify it under the terms of the GNU
+# General Public License version 3 as published by
 # the Free Software Foundation.
 #
 
@@ -18,12 +18,13 @@
 #                       apache is running.
 # $apache_default_group: Set this to the group with which the
 #                        apache is running.
-class apache {
+class apache(
+  $cluster_node = hiera('apache_cluster_node','')
+) {
   case $::operatingsystem {
     centos: { include apache::centos }
     gentoo: { include apache::gentoo }
-    debian: { include apache::debian }
-    ubuntu: { include apache::ubuntu }
+    debian,ubuntu: { include apache::debian }
     openbsd: { include apache::openbsd }
     default: { include apache::base }
   }
-- 
cgit v1.2.3


From a5be3114f8af104415205b0763e51d3ad24c33cd Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 13 Jun 2012 17:45:35 -0300
Subject: remove hiera

---
 manifests/init.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index a471591..572213f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,7 +19,9 @@
 # $apache_default_group: Set this to the group with which the
 #                        apache is running.
 class apache(
-  $cluster_node = hiera('apache_cluster_node','')
+  $cluster_node = '',
+  $manage_shorewall = false,
+  $manage_munin = false
 ) {
   case $::operatingsystem {
     centos: { include apache::centos }
@@ -28,10 +30,10 @@ class apache(
     openbsd: { include apache::openbsd }
     default: { include apache::base }
   }
-  if hiera('use_munin',false) {
+  if $apache::manage_munin {
     include apache::status
   }
-  if hiera('use_shorewall',false) {
+  if $apache::manage_shorewall {
     include shorewall::rules::http
   }
 }
-- 
cgit v1.2.3


From 03fcb575adaee4678490c6ea577fdab94519d54e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 13 Dec 2012 15:30:14 +0100
Subject: introduce anchor to hook into basic setup

---
 manifests/init.pp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 572213f..612149d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,12 +12,7 @@
 # the Free Software Foundation.
 #
 
-# Global variables:
-#
-# $apache_default_user: Set this to the user with which the
-#                       apache is running.
-# $apache_default_group: Set this to the group with which the
-#                        apache is running.
+# manage a simple apache
 class apache(
   $cluster_node = '',
   $manage_shorewall = false,
-- 
cgit v1.2.3