diff options
author | mh <mh@immerda.ch> | 2016-06-26 13:39:04 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2016-06-26 13:39:27 +0200 |
commit | 4a0cfbb26e072d12bcb14a31ef8b6f69e190d42e (patch) | |
tree | 89ec6a3c92b6e31691e33f677a49e111f238a138 /manifests/base.pp | |
parent | 543ae812999f35008a835db19b22874d5f6e923c (diff) |
modernize so we don't need to deploy a full config file anymore
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 0cf3dc6..cf8811b 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -27,14 +27,20 @@ class shorewall::base { } } else { - Class['augeas'] -> Class['shorewall::base'] - - 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 => Exec['shorewall_check'], - require => Package['shorewall']; + if str2bool($shorewall::startup) { + $startup_str = 'Yes' + } else { + $startup_str = 'No' + } + shorewall::config_setting{ + 'CONFIG_PATH': + value => "\"\${CONFDIR}/shorewall/puppet:\${CONFDIR}/shorewall:\${SHAREDIR}/shorewall\""; + 'STARTUP_ENABLED': + value => $startup_str; + } + shorewall::config_settings{ + keys($shorewall::settings): + settings => $shorewall::settings; } } |