summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-11-28 23:38:30 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-11-28 23:38:30 -0200
commit0a66e40f2f1ce012f9b3101c63423852175365a0 (patch)
tree23838cc4acd4daadf72edc0fbb83ccf03a082b80
parent53121f6cf4f7b51b22ef5cf952656794ef5e3837 (diff)
downloadpuppet-mail-0a66e40f2f1ce012f9b3101c63423852175365a0.tar.gz
puppet-mail-0a66e40f2f1ce012f9b3101c63423852175365a0.tar.bz2
Using ssl::cert to define certificates
-rw-r--r--manifests/system.pp2
-rw-r--r--manifests/tls.pp7
2 files changed, 8 insertions, 1 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index ac39929..f9cd31b 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -18,7 +18,7 @@ class mail::system {
# Module requirements
include postfix
- include ssl::mail
+ include ssl
# Common subsystems
include mail::packages
diff --git a/manifests/tls.pp b/manifests/tls.pp
index 291e82c..0f63a56 100644
--- a/manifests/tls.pp
+++ b/manifests/tls.pp
@@ -10,6 +10,13 @@ class mail::tls {
# TLS Policy
include postfix::tlspolicy
+ # SSL certificate
+ ssl::cert { "cert":
+ group => 'postfix',
+ privmode => '0640',
+ notify => Service['postfix'],
+ }
+
# Check SSL certificate
ssl::check { "$domain":
file => true,