diff options
author | mh <mh@immerda.ch> | 2017-11-02 16:27:01 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2017-11-02 16:27:01 +0100 |
commit | fab57483f46bab58275063081c5e4e6f7db9d2ab (patch) | |
tree | c45fa3f8650119ca7c2e1050387d0ae568b3c3e9 | |
parent | 9a8057158e7a08a3da86fee163e8d955193e6900 (diff) |
switch to the new facts hash
-rw-r--r-- | manifests/init.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 61187f0..c286ba5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -8,7 +8,7 @@ class shorewall( $ensure_version = 'present', $tor_transparent_proxy_host = '127.0.0.1', $tor_transparent_proxy_port = '9040', - $tor_user = $::operatingsystem ? { + $tor_user = $facts['operatingsystem'] ? { 'Debian' => 'debian-tor', default => 'tor' }, @@ -59,7 +59,7 @@ class shorewall( # workaround https://tickets.puppetlabs.com/browse/FACT-1739 if $shorewall6 == 'auto' { - if $ipaddress6 and $ipaddress6 =~ /:/ { + if $facts['ipaddress6'] and $facts['ipaddress6'] =~ /:/ { $with_shorewall6 = true } else { $with_shorewall6 = false @@ -79,12 +79,12 @@ class shorewall( $merged_settings = merge($def_settings,$settings) - case $::operatingsystem { + case $facts['operatingsystem'] { 'Gentoo': { include ::shorewall::gentoo } 'Debian','Ubuntu': { include ::shorewall::debian } 'CentOS': { include ::shorewall::centos } default: { - notice "unknown operatingsystem: ${::operatingsystem}" + notice "unknown operatingsystem: ${facts['operatingsystem']}" include ::shorewall::base } } |