diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
| commit | cd6351ab1212d5dea85db326113c887065b1efd6 (patch) | |
| tree | 65c1f714456ce8ec15ff71eca0106f903dbc2e52 /modules/postfix | |
| parent | c173069efea53f72fc7c6a758f8eebe772464a6f (diff) | |
| download | puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.gz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.bz2 puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.xz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.zip | |
- do not let file with passwords to be world readable
( even if being readable by apache is not good either, but needed as the password is used by apache )
- use ldaps for sympa
- use the 2 new facter macro and remove the version copied everywhere
- remove hardcoded domain in bugzilla and others
Diffstat (limited to 'modules/postfix')
| -rw-r--r-- | modules/postfix/templates/main.cf | 5 | ||||
| -rw-r--r-- | modules/postfix/templates/simple_relay_main.cf | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index e6f53bbf..7b60f3a3 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -3,9 +3,6 @@ # 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 @@ -14,7 +11,7 @@ sendmail_path = /usr/sbin/sendmail.postfix setgid_group = postdrop command_directory = /usr/sbin manpage_directory = /usr/share/man -daemon_directory = <%= path_daemon_directory %> +daemon_directory = <%= lib_dir %>/postfix/ data_directory = /var/lib/postfix newaliases_path = /usr/bin/newaliases mailq_path = /usr/bin/mailq diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf index dbe473d1..5f8d44ca 100644 --- a/modules/postfix/templates/simple_relay_main.cf +++ b/modules/postfix/templates/simple_relay_main.cf @@ -3,9 +3,6 @@ # 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 @@ -14,7 +11,7 @@ sendmail_path = /usr/sbin/sendmail.postfix setgid_group = postdrop command_directory = /usr/sbin manpage_directory = /usr/share/man -daemon_directory = <%= path_daemon_directory %> +daemon_directory = <%= lib_dir %>/postfix/ data_directory = /var/lib/postfix newaliases_path = /usr/bin/newaliases mailq_path = /usr/bin/mailq |