From fa1c9b0a0cb5638e4c029f01901d6b61c691e1c3 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 10 Feb 2012 16:50:45 +0100
Subject: move global variables to hiera

---
 manifests/base.pp    | 2 +-
 manifests/centos.pp  | 2 +-
 manifests/include.pp | 2 +-
 manifests/init.pp    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index a22465a..2c7710c 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -13,7 +13,7 @@ class squid::base {
     file {"squid_config":
         path => "/etc/squid/squid.conf",
         ensure => file, owner => root, group => root, mode => 644,
-        source => [ "puppet:///modules/site-squid/${fqdn}/squid.conf",
+        source => [ "puppet:///modules/site-squid/${::fqdn}/squid.conf",
                     "puppet:///modules/site-squid/squid.conf",
                     "puppet:///modules/squid/squid.conf" ],
         notify => Service[squid],
diff --git a/manifests/centos.pp b/manifests/centos.pp
index b53469b..c58b8ce 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -3,7 +3,7 @@
 # distro rpms seems to have problems...
 class squid::centos inherits squid::base {
     file{'/etc/sysconfig/squid':
-        source => [ "puppet:///modules/site-squid/sysconfig/${fqdn}/squid",
+        source => [ "puppet:///modules/site-squid/sysconfig/${::fqdn}/squid",
                     "puppet:///modules/site-squid/sysconfig/squid",
                     "puppet:///modules/squid/sysconfig/squid" ],
         require => Package['squid'],
diff --git a/manifests/include.pp b/manifests/include.pp
index 6e5a736..673411d 100644
--- a/manifests/include.pp
+++ b/manifests/include.pp
@@ -9,7 +9,7 @@ define squid::include($content = undef){
 
   if !$content {
     File["/etc/squid/include.d/${name}"]{
-      source => [ "puppet:///modules/site-squid/include.d/${fqdn}/${name}",
+      source => [ "puppet:///modules/site-squid/include.d/${::fqdn}/${name}",
                   "puppet:///modules/site-squid/include.d/${name}" ]
     }
   } else {
diff --git a/manifests/init.pp b/manifests/init.pp
index c473c9b..7afab95 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,14 +2,14 @@
 # Copyright (C) 2007 admin@immerda.ch
 #
 
-class squid { 
-    case $operatingsystem {
+class squid {
+    case $::operatingsystem {
         gentoo: { include squid::gentoo }
         centos: { include squid::centos }
         default: { include squid::base }
     }
 
-    if $use_munin {
+    if hiera('use_munin',false) {
         include squid::munin
     }
 }
-- 
cgit v1.2.3