diff options
| author | Micah <micah@riseup.net> | 2015-02-20 22:26:45 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-02-20 22:26:45 +0000 |
| commit | 877134184b26c0ff326d46ff332f287d9e8a1be1 (patch) | |
| tree | 81b6a17501350c3779b233a83bed4a525b69e4c4 /manifests | |
| parent | a9ec67ca025197e9e85b6d6752f76ff8cac37f92 (diff) | |
| parent | 3d3e096d8ddc6ff8a7d589e440fe621abb2b8767 (diff) | |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
This version should be compatible with the cleaned up common module.
See merge request !1
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/transport.pp | 6 | ||||
| -rw-r--r-- | manifests/virtual.pp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c7b9ce8..3d51bb1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -59,7 +59,7 @@ class postfix( case $::operatingsystem { RedHat, CentOS: { - case $::lsbmajdistrelease { + case $::operatingsystemmajrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } default: { $postfix_seltype = undef } @@ -143,7 +143,7 @@ class postfix( content => $::operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), CentOS => template("postfix/master.cf.redhat5.erb"), - Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"), + Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, diff --git a/manifests/transport.pp b/manifests/transport.pp index 90c5468..08b93e5 100644 --- a/manifests/transport.pp +++ b/manifests/transport.pp @@ -12,7 +12,7 @@ Requires: - Class["postfix"] - Postfix::Hash["/etc/postfix/transport"] - Postfix::Config["transport_maps"] -- common::line (from module common) +- file_line (from module stdlib) Example usage: @@ -34,9 +34,9 @@ Example usage: */ define postfix::transport ($ensure="present", $destination) { - line {"${name} ${destination}": + file_line {"${name} ${destination}": ensure => $ensure, - file => "/etc/postfix/transport", + path => "/etc/postfix/transport", line => "${name} ${destination}", notify => Exec["generate /etc/postfix/transport.db"], require => Package["postfix"], diff --git a/manifests/virtual.pp b/manifests/virtual.pp index d6912a4..06df32a 100644 --- a/manifests/virtual.pp +++ b/manifests/virtual.pp @@ -12,7 +12,7 @@ Requires: - Class["postfix"] - Postfix::Hash["/etc/postfix/virtual"] - Postfix::Config["virtual_alias_maps"] -- common::line (from module common) +- file_line (from module stdlib) Example usage: @@ -34,9 +34,9 @@ Example usage: */ define postfix::virtual ($ensure="present", $destination) { - line {"${name} ${destination}": + file_line {"${name} ${destination}": ensure => $ensure, - file => "/etc/postfix/virtual", + path => "/etc/postfix/virtual", line => "${name} ${destination}", notify => Exec["generate /etc/postfix/virtual.db"], require => Package["postfix"], |