Automatic PR to nightly from 2024-11-13T13:59:18Z #6166
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 89398c4.
* update.sh: precaution ask for deletion of dns_blocklists.cf if old format (#6154) * [Web] Updated lang.zh-cn.json (#6151) [Web] Updated lang.zh-cn.json Co-authored-by: Easton Man <me@eastonman.com> * compose: bump sogo version to include 5.11.2 (#6156) * php: use correct php image + workaround of #6149 (#6159) * compose: bump php-fpm container to correctly use patched c-ares * [Web] check $containers_info contains required fields --------- Co-authored-by: FreddleSpl0it <patschul@posteo.de> --------- Co-authored-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: Easton Man <me@eastonman.com> Co-authored-by: FreddleSpl0it <patschul@posteo.de>
DerLinkman
force-pushed
the
staging
branch
2 times, most recently
from
aaee040 to
4d688c5
Compare
[Nginx] Use jinja2 for templating nginx configuration
[Web] remove f2b banlist from json_api.php
Enable password protection for Redis
[Web] add missing translation for ratelimit in templates overview
[Web] Add additional columns to _sogo_static_view
[Web] allow dots in dkim selectors
Only show active protocols on "last login" in mailbox overview
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📁 Modified files
.github/FUNDING.yml | 1 +
data/Dockerfiles/acme/acme.sh | 4 +-
data/Dockerfiles/acme/obtain-certificate.sh | 2 +-
data/Dockerfiles/dockerapi/main.py | 4 +-
data/Dockerfiles/dovecot/clean_q_aged.sh | 2 +-
data/Dockerfiles/dovecot/docker-entrypoint.sh | 4 +-
data/Dockerfiles/dovecot/quarantine_notify.py | 2 +-
data/Dockerfiles/dovecot/quota_notify.py | 2 +-
data/Dockerfiles/dovecot/repl_health.sh | 4 +-
.../Dockerfiles/dovecot/syslog-ng-redis_slave.conf | 2 +
data/Dockerfiles/dovecot/syslog-ng.conf | 2 +
data/Dockerfiles/dovecot/trim_logs.sh | 4 +-
data/Dockerfiles/netfilter/main.py | 8 +-
data/Dockerfiles/nginx/Dockerfile (new) | 18 ++
data/Dockerfiles/nginx/bootstrap.py (new) | 76 +++++
.../nginx/docker-entrypoint.sh (new +x) | 26 ++
data/Dockerfiles/phpfpm/docker-entrypoint.sh | 4 +-
.../Dockerfiles/postfix/syslog-ng-redis_slave.conf | 2 +
data/Dockerfiles/postfix/syslog-ng.conf | 2 +
data/Dockerfiles/rspamd/docker-entrypoint.sh | 12 +-
data/Dockerfiles/sogo/syslog-ng-redis_slave.conf | 2 +
data/Dockerfiles/sogo/syslog-ng.conf | 2 +
data/Dockerfiles/watchdog/watchdog.sh | 20 +-
data/conf/mysql/my.cnf | 2 +-
data/conf/nginx/000-map-size.conf (gone) | 3 -
data/conf/nginx/dynmaps.conf (gone) | 19 --
data/conf/nginx/includes/site-defaults.conf (gone) | 242 ---------------
.../nginx/includes/sogo_proxy_auth.conf (gone) | 8 -
data/conf/nginx/meta_exporter.conf (gone) | 19 --
data/conf/nginx/nginx.conf.j2 (new) | 119 ++++++++
data/conf/nginx/site.conf (gone) | 10 -
data/conf/nginx/sites-default.conf.j2 (new) | 276 +++++++++++++++++
.../nginx/templates/listen_plain.template (gone) | 2 -
.../nginx/templates/listen_ssl.template (gone) | 3 -
.../nginx/templates/server_name.template.sh (gone) | 1 -
data/conf/nginx/templates/sites.template.sh (gone) | 38 ---
data/conf/nginx/templates/sogo.template (gone) | 1 -
.../nginx/templates/sogo_eas.template.sh (gone) | 5 -
data/conf/postfix/postscreen_access.cidr | 76 ++---
data/conf/redis/redis-conf.sh (new +x) | 7 +
data/conf/rspamd/dynmaps/aliasexp.php | 1 +
data/conf/rspamd/dynmaps/forwardinghosts.php | 1 +
data/conf/rspamd/meta_exporter/pipe.php | 7 +-
data/conf/rspamd/meta_exporter/pipe_rl.php | 1 +
data/conf/rspamd/meta_exporter/pushover.php | 1 +
data/web/_rspamderror.php | 1 +
data/web/admin.php | 2 +-
data/web/autodiscover.php | 1 +
data/web/debug.php | 22 +-
data/web/f2b-banlist.php (new) | 11 +
data/web/inc/functions.dkim.inc.php | 4 +-
data/web/inc/functions.inc.php | 2 +
data/web/inc/functions.mailbox.inc.php | 7 +-
data/web/inc/init_db.inc.php | 20 +-
data/web/inc/prerequisites.inc.php | 3 +-
data/web/js/site/mailbox.js | 41 +--
data/web/json_api.php | 14 -
data/web/lang/lang.fr-fr.json | 2 +-
data/web/lang/lang.ru-ru.json | 333 ++++++++++++++-------
data/web/lang/lang.zh-cn.json | 145 +++++++--
data/web/mailbox.php | 1 +
data/web/templates/admin/tab-config-f2b.twig | 2 +-
data/web/templates/mailbox.twig | 1 +
docker-compose.yml | 59 ++--
generate_config.sh | 18 +-
helper-scripts/_cold-standby.sh | 4 +-
helper-scripts/backup_and_restore.sh | 2 +-
helper-scripts/nextcloud.sh | 4 +-
helper-scripts/reset-learns.sh | 10 +-
update.sh | 39 +++
70 files changed, 1100 insertions(+), 695 deletions(-)