aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-02-16 16:58:09 +0100
committermh <mh@immerda.ch>2012-02-16 16:58:09 +0100
commit2c86670a9233ee62d16b16730218994a1fe7eb9b (patch)
tree858e1a576863678f675b6be0f5f45b9b77f01d04
parent77578b93bd98bf0bf9cf69e4fa8da75dcf9c236d (diff)
downloadpuppet-postfix-2c86670a9233ee62d16b16730218994a1fe7eb9b.tar.gz
puppet-postfix-2c86670a9233ee62d16b16730218994a1fe7eb9b.tar.bz2
Use proper variable scope
Facts should be addressed with $::fqdn and so on.
-rw-r--r--manifests/hash.pp24
-rw-r--r--manifests/init.pp12
-rw-r--r--manifests/satellite.pp2
3 files changed, 11 insertions, 27 deletions
diff --git a/manifests/hash.pp b/manifests/hash.pp
index c8bb7c7..6e2012f 100644
--- a/manifests/hash.pp
+++ b/manifests/hash.pp
@@ -29,23 +29,7 @@ Example usage:
*/
define postfix::hash ($ensure="present", $source = false) {
-
- # selinux labels differ from one distribution to another
- case $operatingsystem {
-
- RedHat, CentOS: {
- case $lsbmajdistrelease {
- "4": { $postfix_seltype = "etc_t" }
- "5": { $postfix_seltype = "postfix_etc_t" }
- default: { $postfix_seltype = undef }
- }
- }
-
- default: {
- $postfix_seltype = undef
- }
- }
-
+ include ::postfix
case $source {
false: {
file {"${name}":
@@ -53,7 +37,7 @@ define postfix::hash ($ensure="present", $source = false) {
mode => 600,
owner => root,
group => root,
- seltype => $postfix_seltype,
+ seltype => $postfix::postfix_seltype,
require => Package["postfix"],
}
}
@@ -64,7 +48,7 @@ define postfix::hash ($ensure="present", $source = false) {
owner => root,
group => root,
source => $source,
- seltype => $postfix_seltype,
+ seltype => $postfix::postfix_seltype,
require => Package["postfix"],
}
}
@@ -74,7 +58,7 @@ define postfix::hash ($ensure="present", $source = false) {
ensure => $ensure,
mode => 600,
require => [File["${name}"], Exec["generate ${name}.db"]],
- seltype => $postfix_seltype,
+ seltype => $postfix::postfix_seltype,
}
exec {"generate ${name}.db":
diff --git a/manifests/init.pp b/manifests/init.pp
index 63a50b9..6d16efc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,10 +18,10 @@
class postfix {
# selinux labels differ from one distribution to another
- case $operatingsystem {
+ case $::operatingsystem {
RedHat, CentOS: {
- case $lsbmajdistrelease {
+ case $::lsbmajdistrelease {
"4": { $postfix_seltype = "etc_t" }
"5": { $postfix_seltype = "postfix_etc_t" }
default: { $postfix_seltype = undef }
@@ -93,7 +93,7 @@ class postfix {
ensure => installed
}
- if $operatingsystem == 'debian' {
+ if $::operatingsystem == 'debian' {
Package[mailx] { name => 'bsd-mailx' }
}
@@ -131,10 +131,10 @@ class postfix {
owner => "root",
group => "root",
mode => "0644",
- content => $operatingsystem ? {
+ content => $::operatingsystem ? {
Redhat => template("postfix/master.cf.redhat5.erb"),
CentOS => template("postfix/master.cf.redhat5.erb"),
- Debian => template("postfix/master.cf.debian-$lsbdistcodename.erb"),
+ Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"),
Ubuntu => template("postfix/master.cf.debian-etch.erb"),
},
seltype => $postfix_seltype,
@@ -162,7 +162,7 @@ class postfix {
"inet_interfaces": value => "${postfix_inet_interfaces}";
}
- case $operatingsystem {
+ case $::operatingsystem {
RedHat, CentOS: {
postfix::config {
"sendmail_path": value => "/usr/sbin/sendmail.postfix";
diff --git a/manifests/satellite.pp b/manifests/satellite.pp
index cb92a9f..99904dd 100644
--- a/manifests/satellite.pp
+++ b/manifests/satellite.pp
@@ -25,7 +25,7 @@ class postfix::satellite {
# If $valid_fqdn exists, use it to override $fqdn
case $valid_fqdn {
- "": { $valid_fqdn = $fqdn }
+ "": { $valid_fqdn = $::fqdn }
default: { $fqdn = "${valid_fqdn}" }
}