0fb43f4916
[Docker API] Create pipe to pass Rspamd UI worker password [Dovecot] Pull Spamassassin ruleset to be read by Rspamd (MANY THANKS to Peer Heinlein!) [Dovecot] Garbage collector for deleted maildirs (set keep time via MAILDIR_GC_TIME which defaults to 1440 minutes) [Web] Flush memcached after mailbox item changes, fixes #1808 [Web] Fix duplicate IDs, fixes #1792 [Compose] Use SQL sockets [PHP-FPM] Update APCu and Redis libs [Dovecot] Encrypt maildir with global key pair in crypt-vol-1 (BACKUP!), also fixes #1791 [Web] Fix deletion of spam aliases [Helper] Add "crypt" to backup script [Helper] Override file for external SQL socket (not supported!) [Compose] New images for Rspamd, PHP-FPM, SOGo, Dovecot, Docker API, Watchdog, ACME, Postfix
62 lines
1.9 KiB
Bash
Executable File
62 lines
1.9 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
function array_by_comma { local IFS=","; echo "$*"; }
|
|
|
|
# Wait for containers
|
|
while ! mysqladmin ping --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
|
|
echo "Waiting for SQL..."
|
|
sleep 2
|
|
done
|
|
|
|
until [[ $(redis-cli -h redis-mailcow PING) == "PONG" ]]; do
|
|
echo "Waiting for Redis..."
|
|
sleep 2
|
|
done
|
|
|
|
# Migrate domain map
|
|
declare -a DOMAIN_ARR
|
|
redis-cli -h redis-mailcow DEL DOMAIN_MAP
|
|
while read line
|
|
do
|
|
DOMAIN_ARR+=("$line")
|
|
done < <(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain FROM domain" -Bs)
|
|
while read line
|
|
do
|
|
DOMAIN_ARR+=("$line")
|
|
done < <(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT alias_domain FROM alias_domain" -Bs)
|
|
|
|
if [[ ! -z ${DOMAIN_ARR} ]]; then
|
|
for domain in "${DOMAIN_ARR[@]}"; do
|
|
redis-cli -h redis-mailcow HSET DOMAIN_MAP ${domain} 1
|
|
done
|
|
fi
|
|
|
|
# Set API options if env vars are not empty
|
|
|
|
if [[ ${API_ALLOW_FROM} != "invalid" ]] && \
|
|
[[ ${API_KEY} != "invalid" ]] && \
|
|
[[ ! -z ${API_KEY} ]] && \
|
|
[[ ! -z ${API_ALLOW_FROM} ]]; then
|
|
IFS=',' read -r -a API_ALLOW_FROM_ARR <<< "${API_ALLOW_FROM}"
|
|
declare -a VALIDATED_API_ALLOW_FROM_ARR
|
|
REGEX_IP6='^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$'
|
|
REGEX_IP4='^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'
|
|
|
|
for IP in "${API_ALLOW_FROM_ARR[@]}"; do
|
|
if [[ ${IP} =~ ${REGEX_IP6} ]] || [[ ${IP} =~ ${REGEX_IP4} ]]; then
|
|
VALIDATED_API_ALLOW_FROM_ARR+=("${IP}")
|
|
fi
|
|
done
|
|
VALIDATED_IPS=$(array_by_comma ${VALIDATED_API_ALLOW_FROM_ARR[*]})
|
|
if [[ ! -z ${VALIDATED_IPS} ]]; then
|
|
mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
|
|
INSERT INTO api (username, api_key, active, allow_from)
|
|
SELECT username, "${API_KEY}", '1', "${VALIDATED_IPS}" FROM admin WHERE superadmin='1' AND active='1'
|
|
ON DUPLICATE KEY UPDATE active = '1', allow_from = "${VALIDATED_IPS}", api_key = "${API_KEY}";
|
|
EOF
|
|
fi
|
|
fi
|
|
|
|
exec "$@"
|