Skip to content

Commit

Permalink
Merge pull request #578 from abednarik/fix/master/redhat_service_name…
Browse files Browse the repository at this point in the history
…_references

(MODULES-2783) Missing ip6tables service name
  • Loading branch information
DavidS committed Jan 8, 2016
2 parents 9df7e88 + 6779867 commit ac4ab65
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions manifests/linux/redhat.pp
Expand Up @@ -46,7 +46,7 @@
exec { '/usr/bin/systemctl daemon-reload':
require => Package[$package_name],
before => Service[$service_name],
unless => '/usr/bin/systemctl is-active iptables'
unless => "/usr/bin/systemctl is-active ${service_name}",
}
}
}
Expand All @@ -55,7 +55,7 @@
ensure => $ensure,
enable => $enable,
hasstatus => true,
require => File['/etc/sysconfig/iptables'],
require => File["/etc/sysconfig/${service_name}"],
}

# Redhat 7 selinux user context for /etc/sysconfig/iptables is set to unconfined_u
Expand All @@ -71,7 +71,7 @@
default: { $seluser = undef }
}

file { '/etc/sysconfig/iptables':
file { "/etc/sysconfig/${service_name}":
ensure => present,
owner => 'root',
group => 'root',
Expand Down

0 comments on commit ac4ab65

Please sign in to comment.