From 94b84dd1fbc63ba36cb1822024fe66014be5d95b Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 20 May 2023 20:12:28 +1000 Subject: [PATCH] sed should be -i -e not -ie, change ldap_relay_recipient_maps to use entryUUID --- .gitlab-ci.yml | 2 +- defaults/ldap_relay_recipient_maps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d995f28..953346b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ services: before_script: - if [ ! -d build-cache ]; then mkdir build-cache; fi -- sed -ie s'/https/http/' /etc/apk/repositories +- sed -i -e s'/https/http/' /etc/apk/repositories - HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl - docker info && docker version # env|sort diff --git a/defaults/ldap_relay_recipient_maps b/defaults/ldap_relay_recipient_maps index 58f31ff..cef84d1 100644 --- a/defaults/ldap_relay_recipient_maps +++ b/defaults/ldap_relay_recipient_maps @@ -9,5 +9,5 @@ query_filter = (&(objectClass=inetLocalMailRecipient) (|(mail=%s)(mailLocalAddre #expansion_limit = 1 #recursion_limit = 1 #size_limit = $expansion_limit -result_attribute = uidNumber +result_attribute = entryUUID # result_format = %s