From 15acadb77a9bee45fe7706b5b6e72a2a05f6250c Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Wed, 27 Oct 2010 10:41:24 +0000
Subject: - fix templates path - remove extranous file

---
 modules/postfix/manifests/init.pp |  2 +-
 modules/postfix/templates/main.cf | 33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 modules/postfix/templates/main.cf

(limited to 'modules/postfix')

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index afe66e41..1a72e04c 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -33,7 +33,7 @@ class postfix {
 
     class simple_relay inherits base {
         file { '/etc/postfix/main.cf':
-            content => template("postfix/simple_relay_main.conf"),
+            content => template("postfix/simple_relay_main.cf"),
         }
     }
 }
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
deleted file mode 100644
index ece80332..00000000
--- a/modules/postfix/templates/main.cf
+++ /dev/null
@@ -1,33 +0,0 @@
-# Please be sure to read the /usr/share/doc/postfix/README.MDK file
-# to learn about differences from stock postfix to Mandriva package.
-# 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.
-
-# These are changed by postfix install script
-readme_directory = /usr/share/doc/postfix/README_FILES
-html_directory = /usr/share/doc/postfix/html
-sendmail_path = /usr/sbin/sendmail.postfix
-setgid_group = postdrop
-command_directory = /usr/sbin
-manpage_directory = /usr/share/man
-daemon_directory = /usr/lib64/postfix
-data_directory = /var/lib/postfix
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-queue_directory = /var/spool/postfix
-mail_owner = postfix
-
-# User configurable parameters
-
-inet_interfaces = localhost
-inet_protocols = all
-mynetworks_style = host
-#delay_warning_time = 4h
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
-unknown_local_recipient_reject_code = 450
-smtp-filter_destination_concurrency_limit = 2
-lmtp-filter_destination_concurrency_limit = 2
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
-smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
-- 
cgit v1.2.1