From 66ad58f2bc3b285bd17d5e61a21afece11d2c293 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 19 Dec 2013 14:22:43 -0500
Subject: Fix the location of the smtp/smtpd_tls_session_cache_database (#4813)

Change-Id: I959fa40ff508bbeaf7baa0b6ba90c10c9e6b0ef7
---
 puppet/modules/site_postfix/manifests/mx/smtp_tls.pp  | 2 +-
 puppet/modules/site_postfix/manifests/mx/smtpd_tls.pp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp b/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
index 4b9c2fd9..3cc7ea72 100644
--- a/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
+++ b/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
@@ -19,7 +19,7 @@ class site_postfix::mx::smtp_tls {
     'smtp_tls_fingerprint_digest':
       value => 'sha1';
     'smtp_tls_session_cache_database':
-      value => 'btree:${queue_directory}/smtp_cache';
+      value => 'btree:${data_directory}/smtp_cache';
     'smtp_tls_security_level':
       value  => 'may';
     # see issue #4011
diff --git a/puppet/modules/site_postfix/manifests/mx/smtpd_tls.pp b/puppet/modules/site_postfix/manifests/mx/smtpd_tls.pp
index 5714218c..0809c75f 100644
--- a/puppet/modules/site_postfix/manifests/mx/smtpd_tls.pp
+++ b/puppet/modules/site_postfix/manifests/mx/smtpd_tls.pp
@@ -15,7 +15,9 @@ class site_postfix::mx::smtpd_tls {
     'smtpd_tls_security_level':
       value  => 'may';
     'smtpd_tls_eecdh_grade':
-      value => 'ultra'
+      value => 'ultra';
+    'smtpd_tls_session_cache_database':
+      value => 'btree:${data_directory}/smtpd_scache';
   }
 
   # Setup DH parameters
-- 
cgit v1.2.3