From c96bdf17b2d89d9088c82272279931eefa97f5b4 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 24 Oct 2017 11:35:39 +0200
Subject: [PATCH] Changing SASL authentication mwechanism to rimap on
 test-mail02.pixelpark.net

---
 .../test-mail02.pixelpark.net.yaml            | 74 ++-----------------
 1 file changed, 5 insertions(+), 69 deletions(-)

diff --git a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
index da6ccbe3..a004b26f 100644
--- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
@@ -10,78 +10,14 @@ infra::additional_classes:
 
 #####################################################
 # SASL configuration
-sasl::authd::mechanism: 'ldap'
-sasl::authd::bind: 'ldap'
-sasl::authd::ldap_auth_method: 'bind'
-sasl::authd::ldap_search_base: 'o=isp'
-sasl::authd::ldap_servers:
-  - 'ldap://ldap.pixelpark.com'
-#sasl::authd::ldap_start_tls: false
-sasl::authd::bind_dn: 'cn=admin'
-sasl::authd::ldap_bind_dn: 'cn=admin'
-sasl::authd::ldap_password: >
-    ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-    DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
-    U9gHYhz1BrPTsyCklW8CC3BiE0W9NRS0Rod+cm6M+7OMzciXbgQMFO6Ko98V
-    tzoTyL8yeWr4ZXNpov/gVD+WTfcKo2A0w+egenTdErN4dclnwzAoSR9QOHNT
-    LUxHa6sTT191+79mjw0CnG1BwDKBnZRyO+fzgACFn0dUIasz7danBbZMPn/n
-    wOuOrXXq/PVNPW9GSeKkbimYCAn7KDwTvJNTJCR7dh29+aq0xoSSsGrN+L+f
-    OZrj3dG58D8lspbxNb4iFMswtOcihByp6n5fRmvnEFXw/Dn507UCTxURoLpp
-    EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
-    EKskgBArkfXhMZNEUfrTvFILs4Ig]
-sasl::authd::ldap_bind_pw: >
-    ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-    DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
-    U9gHYhz1BrPTsyCklW8CC3BiE0W9NRS0Rod+cm6M+7OMzciXbgQMFO6Ko98V
-    tzoTyL8yeWr4ZXNpov/gVD+WTfcKo2A0w+egenTdErN4dclnwzAoSR9QOHNT
-    LUxHa6sTT191+79mjw0CnG1BwDKBnZRyO+fzgACFn0dUIasz7danBbZMPn/n
-    wOuOrXXq/PVNPW9GSeKkbimYCAn7KDwTvJNTJCR7dh29+aq0xoSSsGrN+L+f
-    OZrj3dG58D8lspbxNb4iFMswtOcihByp6n5fRmvnEFXw/Dn507UCTxURoLpp
-    EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
-    EKskgBArkfXhMZNEUfrTvFILs4Ig]
-sasl::authd::ldap_version: '3'
-sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(|(uid=%u)(mail=%u)))'
+sasl::authd::mechanism: 'rimap'
 
-infra::profile::sasl::enable_authd: true
-infra::profile::sasl::application:
-  smtpd:
-    mech_list:
-      - PLAIN
-      - LOGIN
-    pwcheck_method: 'saslauthd'
+#sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(|(uid=%u)(mail=%u)))'
+sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(mail=%u@%r))'
+sasl::authd::imap_server: 'mail-brln-store02.pixelpark.com'
+sasl::authd::threads: 2
 
 
 #####################################################
 # Postfix configuration:
 
-# Global configurations
-postfix::alias_maps: "hash:/etc/postfix/maps/aliases ldap:/etc/postfix/ldap/alias.cf"
-postfix::inet_interfaces: 'all'
-postfix::manage_mailx: false
-postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
-postfix::myorigin: 'pixelpark.com'
-
-infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
-infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
-infra::profile::postfix::has_map_smtp_tls_peers: true
-#infra::profile::postfix::relayhost: ''
-infra::profile::postfix::tls: true
-infra::profile::postfix::is_relay: true
-infra::profile::postfix::has_default_generic: false
-
-#infra::profile::postfix::ldap_server: 'ldap.pixelpark.com'
-#infra::profile::postfix::ldap_port: '389'
-#infra::profile::postfix::ldap_timeout: '5'
-#infra::profile::postfix::ldap_search_base: 'o=isp'
-#infra::profile::postfix::ldap_bind_dn: 'cn=admin'
-infra::profile::postfix::ldap_bind_pw: >
-    ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-    DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
-    U9gHYhz1BrPTsyCklW8CC3BiE0W9NRS0Rod+cm6M+7OMzciXbgQMFO6Ko98V
-    tzoTyL8yeWr4ZXNpov/gVD+WTfcKo2A0w+egenTdErN4dclnwzAoSR9QOHNT
-    LUxHa6sTT191+79mjw0CnG1BwDKBnZRyO+fzgACFn0dUIasz7danBbZMPn/n
-    wOuOrXXq/PVNPW9GSeKkbimYCAn7KDwTvJNTJCR7dh29+aq0xoSSsGrN+L+f
-    OZrj3dG58D8lspbxNb4iFMswtOcihByp6n5fRmvnEFXw/Dn507UCTxURoLpp
-    EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
-    EKskgBArkfXhMZNEUfrTvFILs4Ig]
-
-- 
2.39.5