diff options
| author | Michael Scherer <misc@mageia.org> | 2010-10-27 10:56:45 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-10-27 10:56:45 +0000 |
| commit | 051dca2706cf21069fbff8c610f2f12d89cae2a7 (patch) | |
| tree | bc48b31f205efa7d11baca698ca70ddee1b0b488 /modules/postfix | |
| parent | 15acadb77a9bee45fe7706b5b6e72a2a05f6250c (diff) | |
| download | puppet-051dca2706cf21069fbff8c610f2f12d89cae2a7.tar puppet-051dca2706cf21069fbff8c610f2f12d89cae2a7.tar.gz puppet-051dca2706cf21069fbff8c610f2f12d89cae2a7.tar.bz2 puppet-051dca2706cf21069fbff8c610f2f12d89cae2a7.tar.xz puppet-051dca2706cf21069fbff8c610f2f12d89cae2a7.zip | |
- fix the x86_64 trick by directly embedding the code in the template, as this avoid the
various scoping problem
Diffstat (limited to 'modules/postfix')
| -rw-r--r-- | modules/postfix/manifests/init.pp | 8 | ||||
| -rw-r--r-- | modules/postfix/templates/simple_relay_main.cf | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp index 1a72e04c..9f95278f 100644 --- a/modules/postfix/manifests/init.pp +++ b/modules/postfix/manifests/init.pp @@ -1,12 +1,4 @@ class postfix { - # some trick to manage daemon directory, who is arch dependent on mdv - $usr_lib = $architecture ? { - x86_64 => "lib64", - default => "lib" - } - - $path_daemon_directory = "/usr/$usr_lib/postfix/" - class base { package { postfix: diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf index 44523eec..dbe473d1 100644 --- a/modules/postfix/templates/simple_relay_main.cf +++ b/modules/postfix/templates/simple_relay_main.cf @@ -3,6 +3,10 @@ # This file contains only the parameters changed from a default install # see /etc/postfix/main.cf.dist for a commented, fuller version of this file. +<% +path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/" +%> + # These are changed by postfix install script readme_directory = /usr/share/doc/postfix/README_FILES html_directory = /usr/share/doc/postfix/html |