remove hiera

3 files changed, 14 insertions, 12 deletions

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
   }
 }
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index a604b05..bfef7ad 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -1,13 +1,13 @@
 # manifests/ssl.pp
 
-class apache::ssl inherits apache {
+class apache::ssl {
   case $::operatingsystem {
     centos: { include apache::ssl::centos }
     openbsd: { include apache::ssl::openbsd }
     debian: { include apache::ssl::debian }
     defaults: { include apache::ssl::base }
   }
-  if hiera('use_shorewall',false) {
+  if $apache::manage_shorewall {
     include shorewall::rules::https
   }
 }
diff --git a/manifests/status.pp b/manifests/status.pp
index 3639b6c..735414c 100644
--- a/manifests/status.pp
+++ b/manifests/status.pp
@@ -1,12 +1,12 @@
 # manifests/status.pp
 
 class apache::status {
-    case $::operatingsystem {
-        centos: { include apache::status::centos }
-        defaults: { include apache::status::base }
-    }
-    if hiera('use_munin',false) {
-        include munin::plugins::apache
-    }
+  case $::operatingsystem {
+    centos: { include apache::status::centos }
+    defaults: { include apache::status::base }
+  }
+  if $apache::manage_munin {
+    include munin::plugins::apache
+  }
 }