diff options
| author | duritong <peter.meier+github@immerda.ch> | 2014-09-19 12:33:47 +0200 |
|---|---|---|
| committer | duritong <peter.meier+github@immerda.ch> | 2014-09-19 12:33:47 +0200 |
| commit | 63d1e4e93db0f540e761336289494a8a24ddea54 (patch) | |
| tree | 2eaf08192bb2a0f37aa1ace7c0e988e10a520b4a | |
| parent | 3d574e179953fc5868b0cd0e972a0dd9b9bda5de (diff) | |
| parent | 5b602647de2abe832be5fbc9329408ea5268ba6c (diff) | |
Merge pull request #6 from key-consulting/master
Several compatibility changes for recent and upcoming Puppet versions
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | manifests/base.pp | 10 | ||||
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/managed_file.pp | 2 |
4 files changed, 8 insertions, 10 deletions
@@ -7,8 +7,8 @@ This module manages the configuration of Shorewall (http://www.shorewall.net/) Requirements ------------ -This module requires the augeas module, you can find that here: -https://labs.riseup.net/code/projects/shared-augeas +This module requires the concat module, you can find that here: +https://github.com/puppetlabs/puppetlabs-concat.git Copyright --------- diff --git a/manifests/base.pp b/manifests/base.pp index 4ee8747..8eee3c0 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -10,14 +10,14 @@ class shorewall::base { '/etc/shorewall/shorewall.conf': require => Package[shorewall], notify => Service[shorewall], - owner => root, - group => 0, + owner => 'root', + group => 'root', mode => '0644'; '/etc/shorewall/puppet': ensure => directory, require => Package[shorewall], - owner => root, - group => 0, + owner => 'root', + group => 'root', mode => '0644'; } @@ -27,8 +27,6 @@ class shorewall::base { } } else { - require augeas - augeas { 'shorewall_module_config_path': changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'', lens => 'Shellvars.lns', diff --git a/manifests/debian.pp b/manifests/debian.pp index c7ed607..01d108f 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,7 +3,7 @@ class shorewall::debian inherits shorewall::base { content => template("shorewall/debian_default.erb"), require => Package['shorewall'], notify => Service['shorewall'], - owner => root, group => 0, mode => 0644; + owner => 'root', group => 'root', mode => '0644'; } Service['shorewall']{ status => '/sbin/shorewall status' diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp index d564daa..7061721 100644 --- a/manifests/managed_file.pp +++ b/manifests/managed_file.pp @@ -2,7 +2,7 @@ define shorewall::managed_file () { concat{ "/etc/shorewall/puppet/${name}": notify => Service['shorewall'], require => File['/etc/shorewall/puppet'], - owner => root, group => 0, mode => 0600; + owner => 'root', group => 'root', mode => '0600'; } concat::fragment { "${name}-header": |