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