Merge branch 'master' of github.com:mailcow/mailcow-dockerized

master
andryyy 2021-07-28 21:44:14 +02:00
commit 21cb3f67b3
4 changed files with 16 additions and 5 deletions

12
.gitignore vendored
View File

@ -1,6 +1,7 @@
!data/conf/nginx/dynmaps.conf
!data/conf/nginx/meta_exporter.conf
!data/conf/nginx/site.conf
!/**/.gitkeep
*.iml
.idea
.vscode/*
@ -44,11 +45,12 @@ data/conf/sogo/sieve.creds
data/conf/sogo/sogo-full.svg
data/gitea/
data/gogs/
data/hooks/dovecot
data/hooks/phpfpm
data/hooks/postfix
data/hooks/rspamd
data/hooks/unbound
data/hooks/dovecot/*
data/hooks/phpfpm/*
data/hooks/postfix/*
data/hooks/rspamd/*
data/hooks/sogo/*
data/hooks/unbound/*
data/web/.well-known/acme-challenge
data/web/css/build/0081-custom-mailcow.css
data/web/inc/vars.local.inc.php

View File

@ -10,4 +10,12 @@ if [[ ! -z ${REDIS_SLAVEOF_IP} ]]; then
cp /etc/syslog-ng/syslog-ng-redis_slave.conf /etc/syslog-ng/syslog-ng.conf
fi
# Run hooks
for file in /hooks/*; do
if [ -x "${file}" ]; then
echo "Running hook ${file}"
"${file}"
fi
done
exec "$@"

View File

View File

@ -181,6 +181,7 @@ services:
dns:
- ${IPV4_NETWORK:-172.22.1}.254
volumes:
- ./data/hooks/sogo:/hooks:Z
- ./data/conf/sogo/:/etc/sogo/:z
- ./data/web/inc/init_db.inc.php:/init_db.inc.php:Z
- ./data/conf/sogo/custom-favicon.ico:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo.ico:z