diff options
| author | mh <mh@immerda.ch> | 2012-02-10 16:50:45 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-02-10 16:50:45 +0100 |
| commit | fa1c9b0a0cb5638e4c029f01901d6b61c691e1c3 (patch) | |
| tree | 493397883ecb77c372b52bde79188788e8961795 | |
| parent | a29a6255cc2f3719b0e0ca7b147e4e3c9f269f5a (diff) | |
move global variables to hiera
| -rw-r--r-- | manifests/base.pp | 2 | ||||
| -rw-r--r-- | manifests/centos.pp | 2 | ||||
| -rw-r--r-- | manifests/include.pp | 2 | ||||
| -rw-r--r-- | 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 } } |