diff options
| author | Michael Scherer <misc@mageia.org> | 2011-08-17 16:48:18 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-08-17 16:48:18 +0000 |
| commit | 20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04 (patch) | |
| tree | 8d97b522fe37f89e949bfdeedb33a39b4f7302b4 /modules/postfix | |
| parent | 7cb29627595a825400dd709b3e56889f6fd1896e (diff) | |
| download | puppet-20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04.tar puppet-20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04.tar.gz puppet-20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04.tar.bz2 puppet-20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04.tar.xz puppet-20e3bb8b732748c5d6d12cc7ee3282bfd6c54c04.zip | |
fix inheritance
Diffstat (limited to 'modules/postfix')
| -rw-r--r-- | modules/postfix/manifests/init.pp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp index eca19a4f..4f3d3c84 100644 --- a/modules/postfix/manifests/init.pp +++ b/modules/postfix/manifests/init.pp @@ -12,21 +12,21 @@ class postfix { subscribe => [ Package['postfix']], path => "/etc/init.d/postfix" } - } - file { '/etc/postfix/main.cf': - ensure => present, - owner => root, - group => root, - mode => 644, - require => Package["postfix"], - content => "", - notify => [Service['postfix']] - } + file { '/etc/postfix/main.cf': + ensure => present, + owner => root, + group => root, + mode => 644, + require => Package["postfix"], + content => "", + notify => [Service['postfix']], + } + } class simple_relay inherits base { - file { '/etc/postfix/main.cf': + File['/etc/postfix/main.cf'] { content => template("postfix/simple_relay_main.cf"), } } @@ -35,7 +35,7 @@ class postfix { include postgrey include amavis include spamassassin - file { '/etc/postfix/main.cf': + File['/etc/postfix/main.cf'] { content => template("postfix/main.cf"), } |