From 5c16ded5b603f6360ca65b78c54a8c27927196ae Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 20 Jan 2013 19:29:18 -0200
Subject: Switching to hiera

---
 manifests/host.pp                | 2 +-
 manifests/nodo.pp                | 4 ++--
 manifests/personal.pp            | 2 +-
 manifests/subsystems/firewall.pp | 2 +-
 manifests/subsystems/monitor.pp  | 2 +-
 manifests/vserver.pp             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/host.pp b/manifests/host.pp
index 219c783..082abe6 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -21,7 +21,7 @@ class nodo::host inherits nodo {
   if !defined('monitor') {
     class { 'monitor':
       type       => 'host',
-      use_nagios => extlookup('host_use_nagios'),
+      use_nagios => hiera('host_use_nagios', true),
     }
   }
 
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 3f29010..0ab3836 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -46,8 +46,8 @@ class nodo {
     }
 
     class { 'apt':
-      include_src      => extlookup('apt_include_src'),
-      use_next_release => extlookup('apt_use_next_release'),
+      include_src      => hiera('apt_include_src', false),
+      use_next_release => hiera('apt_use_next_release', false),
     }
 
     include apt::unattended_upgrades
diff --git a/manifests/personal.pp b/manifests/personal.pp
index 79bd611..dfcacb0 100644
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -12,7 +12,7 @@ class nodo::personal {
   # Monitoring
   class { 'monitor':
     type       => 'personal',
-    use_nagios => extlookup('personal_use_nagios'),
+    use_nagios => hiera('personal_use_nagios', false),
   }
 
   # Currently tor management just works for debian
diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 130e638..6d31461 100644
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -118,7 +118,7 @@ class firewall {
     destination     => '$FW',
     proto           => '-',
     destinationport => '-',
-    ratelimit       => extlookup("firewall_ssl_ratelimit", '-'),
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),
     order           => 103,
   }
 
diff --git a/manifests/subsystems/monitor.pp b/manifests/subsystems/monitor.pp
index f4b5ccb..ee648ef 100644
--- a/manifests/subsystems/monitor.pp
+++ b/manifests/subsystems/monitor.pp
@@ -1,7 +1,7 @@
 class monitor(
   $type = 'vserver',
   $use_nagios = true,
-  $use_fqdn = extlookup('use_nagios_fqdn')
+  $use_fqdn = hiera('use_nagios_fqdn', false)
 ) {
 
   if $use_nagios != false {
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index f4558af..198c755 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -48,7 +48,7 @@ class nodo::vserver inherits nodo {
       # Nagios configuration
       class { 'monitor':
         type       => 'vserver',
-        use_nagios => extlookup('vserver_use_nagios'),
+        use_nagios => hiera('vserver_use_nagios', false),
       }
     }
   }
-- 
cgit v1.2.3