diff --git a/.gitignore b/.gitignore index e1e8e8882..43bc74e0e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ data/conf/rspamd/local.d/* data/conf/rspamd/override.d/* data/conf/sogo/custom-theme.js data/conf/sogo/plist_ldap +data/conf/sogo/plist_ldap.sh data/conf/sogo/sieve.creds data/conf/sogo/sogo-full.svg data/gitea/ diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh index 3eb591186..8913fd2c8 100755 --- a/data/Dockerfiles/sogo/bootstrap-sogo.sh +++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh @@ -107,7 +107,7 @@ while read -r line gal " >> /var/lib/sogo/GNUstep/Defaults/sogod.plist # Generate alternative LDAP authentication dict, when SQL authentication fails # 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 " " >> /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) diff --git a/data/conf/sogo/plist_ldap b/data/conf/sogo/plist_ldap.sh old mode 100644 new mode 100755 similarity index 85% rename from data/conf/sogo/plist_ldap rename to data/conf/sogo/plist_ldap.sh index d585a494f..c35949c65 --- a/data/conf/sogo/plist_ldap +++ b/data/conf/sogo/plist_ldap.sh @@ -1,28 +1,34 @@ - +#!/bin/bash + +domain="$1" +gal_status="$2" + +echo ' + ' diff --git a/docker-compose.yml b/docker-compose.yml index ee180bc61..ea8f7feb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -190,7 +190,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:nightly-20240208 + image: mailcow/sogo:nightly-20240220 environment: - DBNAME=${DBNAME} - DBUSER=${DBUSER}