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

[Web] Allow to use data/web/css/build/0081-custom-mailcow.css for ignored overrides

master
andryyy 2019-12-02 14:46:47 +01:00
parent 7f458f451b
commit 287f3ed921
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ data/conf/postfix/allow_mailcow_local.regexp
data/conf/dovecot/sql data/conf/dovecot/sql
data/conf/nextcloud-*.bak data/conf/nextcloud-*.bak
data/web/inc/vars.local.inc.php data/web/inc/vars.local.inc.php
data/web/css/build/0081-custom-mailcow.css
data/assets/ssl/* data/assets/ssl/*
.vscode/* .vscode/*
.idea .idea

3
data/Dockerfiles/phpfpm/docker-entrypoint.sh
View File

@ -106,6 +106,9 @@ for domain in "${DOMAIN_ARR[@]}"; do
done done
fi fi
# Create dummy for custom overrides of mailcow style
[[ ! -f /web/css/build/0081-custom-mailcow.css ]] && echo '/* Autogenerated by mailcow */' > /web/css/build/0081-custom-mailcow.css
# Set API options if env vars are not empty # Set API options if env vars are not empty
if [[ ${API_ALLOW_FROM} != "invalid" ]] && \ if [[ ${API_ALLOW_FROM} != "invalid" ]] && \

2
docker-compose.yml
View File

@ -96,7 +96,7 @@ services:
- rspamd - rspamd
php-fpm-mailcow: php-fpm-mailcow:
image: mailcow/phpfpm:1.54 image: mailcow/phpfpm:1.55
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on: depends_on:
- redis-mailcow - redis-mailcow