From 541091e8fe0a3523ee73e73c764485e76dc8e12f Mon Sep 17 00:00:00 2001 From: Wolf Noble Date: Sun, 16 Jun 2013 13:07:20 -0500 Subject: [PATCH] Minor fixes to appease puppet-lint Signed-off-by: Wolf Noble --- manifests/linux.pp | 2 ++ manifests/linux/archlinux.pp | 10 ++++++---- manifests/linux/debian.pp | 16 +++++++++------- manifests/linux/redhat.pp | 6 ++++-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/manifests/linux.pp b/manifests/linux.pp index 13ad762..184d9e9 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -1,3 +1,5 @@ +# +#This class includes the proper sub-class for the distro being run class firewall::linux ( $ensure = running ) { diff --git a/manifests/linux/archlinux.pp b/manifests/linux/archlinux.pp index ef7991b..317cdb5 100644 --- a/manifests/linux/archlinux.pp +++ b/manifests/linux/archlinux.pp @@ -1,16 +1,18 @@ +# +#This class manages iptables on archlinux class firewall::linux::archlinux ( $ensure = 'running', $enable = true ) { service { 'iptables': - ensure => $ensure, - enable => $enable, + ensure => $ensure, + enable => $enable, hasstatus => true, } service { 'ip6tables': - ensure => $ensure, - enable => $enable, + ensure => $ensure, + enable => $enable, hasstatus => true, } diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp index 1d60156..bbf666a 100644 --- a/manifests/linux/debian.pp +++ b/manifests/linux/debian.pp @@ -1,3 +1,5 @@ +# +#This class manages iptables on debian class firewall::linux::debian ( $ensure = running, $enable = true @@ -6,23 +8,23 @@ class firewall::linux::debian ( ensure => present, } - if($operatingsystemrelease =~ /^6\./ and $enable == true) { + if($::operatingsystemrelease =~ /^6\./ and $enable == true) { # This fixes a bug in the iptables-persistent LSB headers in 6.x, without it # we lose idempotency exec { 'iptables-persistent-enable': logoutput => on_failure, - command => '/usr/sbin/update-rc.d iptables-persistent enable', - unless => '/usr/bin/test -f /etc/rcS.d/S*iptables-persistent', - require => Package['iptables-persistent'], + command => '/usr/sbin/update-rc.d iptables-persistent enable', + unless => '/usr/bin/test -f /etc/rcS.d/S*iptables-persistent', + require => Package['iptables-persistent'], } } else { # This isn't a real service/daemon. The start action loads rules, so just # needs to be called on system boot. service { 'iptables-persistent': - ensure => undef, - enable => $enable, + ensure => undef, + enable => $enable, hasstatus => true, - require => Package['iptables-persistent'], + require => Package['iptables-persistent'], } } } diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp index b318193..bb91757 100644 --- a/manifests/linux/redhat.pp +++ b/manifests/linux/redhat.pp @@ -1,10 +1,12 @@ +# +#This class manages iptables on redhat class firewall::linux::redhat ( $ensure = running, $enable = true ) { service { 'iptables': - ensure => $ensure, - enable => $enable, + ensure => $ensure, + enable => $enable, hasstatus => true, } } -- 2.45.2