Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164386
Change subject: Replace user_forward shellout by an Exim LDAP query
......................................................................
Replace user_forward shellout by an Exim LDAP query
This change doesn't remove the shell script yet.
Change-Id: Ib8c1228b18434d94ff58469d249f5e925d959f40
---
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/templates/exim4.conf.erb
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/164386/1
diff --git a/modules/toollabs/manifests/mailrelay.pp
b/modules/toollabs/manifests/mailrelay.pp
index 07bb434..f880ede 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -13,7 +13,12 @@
class toollabs::mailrelay($maildomain,
$gridmaster) inherits toollabs {
include toollabs::infrastructure,
- toollabs::gridnode
+ toollabs::gridnode,
+ ldap::role::config::labs
+
+ $ldap_servers = $ldap::role::config::labs::servernames
+ $ldapbind = $ldap::role::config::labs::ldapconfig['proxyagent']
+ $ldappass = $ldap::role::config::labs::ldapconfig['proxypass']
# FIXME: -ugly-, we need to have a better way for this
Package <| title == 'exim4-daemon-light' |> {
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 4b7df6f..58b4f89 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -10,6 +10,7 @@
INSTANCEPROJECT=<%= @instanceproject %>
MAILDOMAIN=<%= @maildomain %>
+LDAPBIND=user="<%= @ldapbind %>" pass=<%= @ldappass %>
###############################
# Main configuration settings #
@@ -23,6 +24,8 @@
acl_smtp_rcpt = acl_check_rcpt
acl_smtp_data = acl_check_data
+
+ldap_default_servers = <%= @ldapservers.join(" : ") %>
never_users = root
@@ -109,7 +112,8 @@
expn = false
check_ancestor
modemask = 002
- data = ${run{/usr/local/sbin/localuser $local_part}{$value}fail}
+ data = ${lookup ldap \
+ {LDAPBIND
ldap:///ou=people,dc=wikimedia,dc=org?mail?sub?(uid=${quote_ldap:$local_part})}}
# Forward mail to <toolname>.<anything>@ using a specific .forward.<anything>
file
# if present in the tool's home directory
--
To view, visit https://gerrit.wikimedia.org/r/164386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8c1228b18434d94ff58469d249f5e925d959f40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
