diff options
| author | mh <mh@immerda.ch> | 2013-02-28 20:38:07 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-03-23 10:51:19 -0400 |
| commit | 3139e5a544868542a7534c6dd2e09f69d0c046a2 (patch) | |
| tree | 508e8570244317ccf6ec176fe1045c3279a83e4f | |
| parent | 13ddac1eb19931b75a8267fb84ced8fb5a6329bd (diff) | |
| download | puppet-shorewall-3139e5a544868542a7534c6dd2e09f69d0c046a2.tar.gz puppet-shorewall-3139e5a544868542a7534c6dd2e09f69d0c046a2.tar.bz2 | |
only manage the config_path if we do not manage the config file
| -rw-r--r-- | manifests/base.pp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 7ee9f0c..6f39bcf 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -20,16 +20,17 @@ class shorewall::base { File['/etc/shorewall/shorewall.conf']{ source => $shorewall::conf_source, } - } + } else { - require augeas + 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', - incl => '/etc/shorewall/shorewall.conf', - notify => Service[shorewall], - require => [ Package['shorewall'] ]; + 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', + incl => '/etc/shorewall/shorewall.conf', + notify => Service[shorewall], + require => Package['shorewall']; + } } service{shorewall: |