diff options
Diffstat (limited to 'manifests/virtual_regexp.pp')
| -rw-r--r-- | manifests/virtual_regexp.pp | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/manifests/virtual_regexp.pp b/manifests/virtual_regexp.pp index 18bbd8c..c3a57d9 100644 --- a/manifests/virtual_regexp.pp +++ b/manifests/virtual_regexp.pp @@ -21,36 +21,17 @@ # class postfix::virtual_regexp { - include common::moduledir - common::module_dir{'postfix/virtual_regexp': } - - $postfix_virtual_regexp_dir = "${common::moduledir::module_dir_path}/postfix/virtual_regexp" - $postfix_virtual_regexp_snippets_dir = "${postfix_virtual_regexp_dir}/virtual_regexp.d" - $postfix_merged_virtual_regexp = "${postfix_virtual_regexp_dir}/merged_virtual_regexp" - - file {"$postfix_virtual_regexp_snippets_dir": - ensure => 'directory', - owner => 'root', - group => '0', - mode => '700', - source => [ - "puppet:///modules/site_postfix/${fqdn}/virtual_regexp.d", - "puppet:///modules/site_postfix/virtual_regexp.d", - "puppet:///files/etc/postfix/virtual_regexp.d", - "puppet:///modules/postfix/virtual_regexp.d", - ], - recurse => true, - purge => false, + concat { '/etc/postfix/virtual_regexp': + owner => root, + group => root, + mode => '0600', } - concatenated_file { "$postfix_merged_virtual_regexp": - dir => "${postfix_virtual_regexp_snippets_dir}", - require => File["$postfix_virtual_regexp_snippets_dir"], - } - - config_file { '/etc/postfix/virtual_regexp': - source => "$postfix_merged_virtual_regexp", - subscribe => File["$postfix_merged_virtual_regexp"], + # Cleanup previous implementation's internal files + include common::moduledir + file { "${common::moduledir::module_dir_path}/postfix/virtual_regexp": + ensure => absent, + recurse => true, + force => true, } - } |