Automatic PR to nightly from 2025-02-11T07:58:45Z #6301
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 commit includes the addition of 3 lines, in the volumes part of the sogo-mailcow container, to allow for better customisation of the user interface on the web client page.
…ker-compose.yml (sogo-mailcow container) After new volumes were added to docker-compose.yml in the sogo-mailcow container, it is necessary to include the specified files in the path, in order for docker to correctly start after running `docker compose up` command, otherwise error will appear, as necessary files would be missing. The files uploaded are original SOGo UI elements, obtained from the sogo-mailcow container. Whenever users will need to change the UI elements, they would just need to change these files. Hence simplifying the process.
Use https://ssl-config.mozilla.org/ffdhe2048.txt due to better security of the key
Fix check_prs_if_on_staging workflow
…6270) * Update generate_config.sh version checking for wider compatibility fix: replace `grep -oP` with `grep -oE` for broader compatibility The `-P` option (Perl-compatible regex) is not supported in all versions of `grep`, particularly the default BSD `grep` on macOS. This change replaces `-P` with `-E` (extended regex), which is more widely available and ensures compatibility across different environments. Tested on macOS and Linux. * Update generate_config.sh to remove use of platform dependent grep Replaced version checking using free-form text. Instead, uses Docker’s built-in templating instead of parsing free-form text. This gives cross-platform consistency without dependency on particular versions of grep.
Ffdhe2048
Adding lines to docker-compose.yml to allow for simpler SOGo web client UI customisation
Co-authored-by: Julie GINESTIERE <[email protected]>
* Update Rspamd to 3.11 * Enable SMTPUTF8 and hide it from SMTPD greeting * Update options.inc * compose: increased rspamd tag
* [Mariadb] Update to 10.11 (LTS) * mysql: set default collation to general_ci
* Move sed cmd to remove discontinued DNSBLs * compose: bump postfix version --------- Co-authored-by: DerLinkman <[email protected]>
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/workflows/check_prs_if_on_staging.yml | 2 +-
.github/workflows/pr_to_nightly.yml | 2 +-
.gitignore | 4 ++-
data/Dockerfiles/dovecot/quota_notify.py | 2 +-
data/Dockerfiles/nginx/bootstrap.py | 3 +-
data/Dockerfiles/postfix/postfix.sh | 7 ++--
data/Dockerfiles/rspamd/Dockerfile | 2 +-
data/Dockerfiles/sogo/Dockerfile | 7 ++--
data/Dockerfiles/sogo/bootstrap-sogo.sh | 6 ++--
data/assets/ssl-example/dhparams.pem | 12 +++----
data/conf/mysql/my.cnf | 4 +--
data/conf/nginx/templates/sites-default.conf.j2 | 6 ++--
data/conf/postfix/main.cf | 5 ++-
data/conf/redis/redis-conf.sh | 5 +++
data/conf/rspamd/local.d/options.inc | 1 +
data/conf/sogo/custom-fulllogo.png (new) | Bin 0 -> 2272 bytes
data/conf/sogo/custom-fulllogo.svg (new) | 44 ++++++++++++++++++++++++
data/conf/sogo/custom-shortlogo.svg (new) | 16 +++++++++
data/web/lang/lang.es-es.json | 11 ++++--
data/web/sogo-auth.php | 7 +++-
docker-compose.yml | 20 +++++++----
generate_config.sh | 2 +-
22 files changed, 127 insertions(+), 41 deletions(-)