Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[SOGo] use bash script for ldap plist template

Browse Source
This commit is contained in:
FreddleSpl0it 2024-02-20 12:42:37 +01:00
parent b3e26e14ef
commit 132e37bfec
No known key found for this signature in database
GPG Key ID: 00E14E7634F4BEC5
4 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -44,6 +44,7 @@ data/conf/rspamd/local.d/*
data/conf/rspamd/override.d/* data/conf/rspamd/override.d/*
data/conf/sogo/custom-theme.js data/conf/sogo/custom-theme.js
data/conf/sogo/plist_ldap data/conf/sogo/plist_ldap
data/conf/sogo/plist_ldap.sh
data/conf/sogo/sieve.creds data/conf/sogo/sieve.creds
data/conf/sogo/sogo-full.svg data/conf/sogo/sogo-full.svg
data/gitea/ data/gitea/

2
data/Dockerfiles/sogo/bootstrap-sogo.sh
View File

@ -107,7 +107,7 @@ while read -r line gal
</dict>" >> /var/lib/sogo/GNUstep/Defaults/sogod.plist </dict>" >> /var/lib/sogo/GNUstep/Defaults/sogod.plist
# Generate alternative LDAP authentication dict, when SQL authentication fails # Generate alternative LDAP authentication dict, when SQL authentication fails
# This will nevertheless read attributes from LDAP # This will nevertheless read attributes from LDAP
line=${line} envsubst < /etc/sogo/plist_ldap >> /var/lib/sogo/GNUstep/Defaults/sogod.plist /etc/sogo/plist_ldap.sh ${line} ${gal} >> /var/lib/sogo/GNUstep/Defaults/sogod.plist
echo " </array> echo " </array>
</dict>" >> /var/lib/sogo/GNUstep/Defaults/sogod.plist </dict>" >> /var/lib/sogo/GNUstep/Defaults/sogod.plist
done < <(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain, CASE gal WHEN '1' THEN 'YES' ELSE 'NO' END AS gal FROM domain;" -B -N) done < <(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain, CASE gal WHEN '1' THEN 'YES' ELSE 'NO' END AS gal FROM domain;" -B -N)

62
data/conf/sogo/plist_ldap → data/conf/sogo/plist_ldap.sh Normal file → Executable file
View File

@ -1,28 +1,34 @@
<!-- #!/bin/bash
<example>
<key>canAuthenticate</key> domain="$1"
<string>YES</string> gal_status="$2"
<key>id</key>
<string>${line}_ldap</string> echo '
<key>isAddressBook</key> <!--
<string>NO</string> <example>
<key>IDFieldName</key> <key>canAuthenticate</key>
<string>mail</string> <string>YES</string>
<key>UIDFieldName</key> <key>id</key>
<string>uid</string> <string>'"${domain}_ldap"'</string>
<key>bindFields</key> <key>isAddressBook</key>
<array> <string>'"${gal_status}"'</string>
<string>mail</string> <key>IDFieldName</key>
</array> <string>mail</string>
<key>type</key> <key>UIDFieldName</key>
<string>ldap</string> <string>uid</string>
<key>bindDN</key> <key>bindFields</key>
<string>cn=admin,dc=example,dc=local</string> <array>
<key>bindPassword</key> <string>mail</string>
<string>password</string> </array>
<key>baseDN</key> <key>type</key>
<string>ou=People,dc=example,dc=local</string> <string>ldap</string>
<key>hostname</key> <key>bindDN</key>
<string>ldap://1.2.3.4:389</string> <string>cn=admin,dc=example,dc=local</string>
</example> <key>bindPassword</key>
--> <string>password</string>
<key>baseDN</key>
<string>ou=People,dc=example,dc=local</string>
<key>hostname</key>
<string>ldap://1.2.3.4:389</string>
</example>
-->'

2
docker-compose.yml
View File

@ -190,7 +190,7 @@ services:
- phpfpm - phpfpm
sogo-mailcow: sogo-mailcow:
image: mailcow/sogo:nightly-20240208 image: mailcow/sogo:nightly-20240220
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}