mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-09 22:48:28 +03:00
876ed221c3
* Cleanup OpenPgpImportPopupView code * update polish translation * small fix * Added Import S/MIME certificate popup And much better handling of the sign and encrypt options * bugfix: store in Passphrases * Resolve #1448 * pre-verify S/MIME opaque signed messages so we have a body to view * Fix timestampToString() for future dates * Move php8.php to /app/libraries/polyfill/ * Improved Settings handling to prevent bugs in outer code * Changed AbstractProvider::IsActive() to be abstract * Example for #1449 * bugfix: previous IsActive() commit * OpenSSL required due to S/MIME * Use get_debug_type() instead of gettype() * update polish translation * Make all Enumerations classes abstract * Added search functionality in Admin -> Config And removed the unused ['capa']['quota'] * Cleanup Quota handling * OPEN_PGP should be OPENPGP as it is one word * Improve Capa handling * Resolve #1451 * Bugfix TypeError: b64Encode(...).match(...) is null * Small StorageType change * Bugfix: mailvelope editor failed * Bugfix: undefined getMailvelopePrivateKeyFor() * Bugfix: MIME parser RegExp didn't escape `boundary` which caused issues * Return detailed info on PgpImportKey * Show GnuPG verify error * Sort PGP keys by email and id * Sort S/MIME certificates on emailAddress else validTo * S/MIME import from signature use `BEGIN PKCS7` * Optionally use existing private key to generate S/MIME certificate * Chaned some error_log() to MailSo Logger() * Force reload of S/MIME certificates list on import * Make better use of SnappyMail\SensitiveString * Fix view PGP key button * Mask all POST data that has a key which contains `pass` * v2.35.1 * Resolve #1455 * Improved GnuPG error handling * Update pt/pt-PT translation * update Polish translation * Drop support for gnupg pecl extension as it fails with "no passphrase" issues * Resolve #1456 * Resolve #1458 * v2.35.2 * fix changelog * Resolve #1461 * Update pt/pt-PT translation * compact-composer plugin v1.0.0 * Resolve #1462 * Fix decrypt error message * `new Error()` to `Error()` * Resolve #1463 * Show url for #1466 * Simplify SignMe/Remember me code * Simplify language Notifications * Bugfix: SetPassword expects \SnappyMail\SensitiveString * https://github.com/the-djmaze/snappymail/issues/1450#issuecomment-1972147950 * improve: fire the 'squire2-toolbar' event after more props are added * improve: add dark theme support and use 'button' element as menu trigger for consistent styling * fix: use compact template in non-destructive way (do not replace the PopupsCompose template if a different wysiwyg is used) * Update admin.json * Update user.json * CSS rainloopErrorTip location * Improved error handling on PGP and S/MIME decrypt * KnockoutJS remove unused `beforeRemove` * KnockoutJS drop unused `as` * KnockoutJS simplify renderMode because only 1 option is used * KnoutJS cleanup templating.js a bit * KnockoutJS drop unused `bindingRewriteValidators` * KnockoutJS drop the twoWayBindings code * KnockoutJS simplify virtualElements binding check * KnockoutJS simplify applyBindingsToNodeInternal * KnockoutJS use Array.isArray * KnockoutJS drop alias `textinput` for `textInput` * KnockoutJS scramble `createChildContext` * KnockoutJS scramble `controlsDescendantBindings` * KnockoutJS scramble `exportDependencies` * KnockoutJS drop unused `throttleEvaluation` * KnockoutJS drop unused `valueAllowUnset` * KnockoutJS drop unused `templateNodes` * KnockoutJS drop unused `optionsCaption` * KnockoutJS drop unused `dontLimitMoves` * KnockoutJS drop unused `uniqueName` * KnockoutJS drop IE leftovers * KnockoutJS drop unused `preprocess` * KnockoutJS drop unused "disposeWhenNodeIsRemoved" and "disposeWhen" * KnockoutJS don't scramble exportDependencies. controlsDescendantBindings, createChildContext * KnockoutJS drop unused `$parentContext` and `$parents` * KnockoutJS drop unused `$rawData` * Knockoutjs built latest * KnockoutJS drop unused template options `nodes`, `if`, `ifnot` * KnockoutJS use more Array.isArray * KnockoutJS cleanup code a bit * KnockoutJS primitiveTypes can just be checked with Object() * KnockoutJS rebuilt * Verify S/MIME signed automatically and log Exception * Automatically verify PGP and S/MIME signed messages * `new Error` to `Error` * By default throw AccountNotAllowed as confused in #1478 * GPG use pinentries for decrypt, sign and export * Better GPG error handling * GPG show error on view/export * OpenPGP fix handling of importing keys * Make "verify signatures automatically" optional, as it requires more IMAP fetching * S/MIME don't post identity key and certificate, just fetch from server * Show error to old browsers, instead of crashing * Automatically verify S/MIME decrypted signed message --------- Co-authored-by: the-djmaze <> Co-authored-by: tinola <tinola@poczta.onet.pl> Co-authored-by: Maarten <3752035+the-djmaze@users.noreply.github.com> Co-authored-by: lmperfis <joint.striker@gmail.com> Co-authored-by: Sergey Mosin <sergey@srgdev.com> Co-authored-by: hguilbert <51283484+hguilbert@users.noreply.github.com>
86 lines
3 KiB
YAML
86 lines
3 KiB
YAML
version: '2'
|
|
services:
|
|
# The reverse proxy for our web containers
|
|
# See https://github.com/traefik/traefik/tree/v2.7/docs/content/user-guides/docker-compose for some examples for enabling HTTPS using ACME
|
|
# You will need a domain name. E.g. 'example.com'
|
|
# This example requests TLS certs via ACME via DNS challenge using OVHcloud as the DNS provider.
|
|
# For a list of supported DNS providers, see: https://doc.traefik.io/traefik/https/acme/#providers
|
|
traefik:
|
|
image: traefik:v2
|
|
environment:
|
|
- OVH_ENDPOINT=xxx
|
|
- OVH_APPLICATION_KEY=xxx
|
|
- OVH_APPLICATION_SECRET=xxx
|
|
- OVH_CONSUMER_KEY=xxx
|
|
volumes:
|
|
# Allow traefik to listen to the Docker events
|
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
|
- acme-volume:/letsencrypt
|
|
ports:
|
|
- 80:80
|
|
- 443:443
|
|
networks:
|
|
- traefik-network
|
|
restart: unless-stopped
|
|
command:
|
|
- --global.checknewversion=false
|
|
- --global.sendanonymoususage=false
|
|
# - --log.level=DEBUG
|
|
- --providers.docker=true
|
|
- --providers.docker.exposedbydefault=false
|
|
- --entrypoints.web.address=:80
|
|
- --entrypoints.websecure.address=:443
|
|
- --certificatesresolvers.myresolver.acme.dnschallenge=true
|
|
- --certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh
|
|
# - --certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
|
|
- --certificatesresolvers.myresolver.acme.email=postmaster@example.com
|
|
- --certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json
|
|
|
|
# snappymail will be available at: https://snappymail.example.com
|
|
snappymail:
|
|
image: djmaze/snappymail:latest
|
|
labels:
|
|
- "traefik.enable=true"
|
|
- "traefik.docker.network=traefik-network"
|
|
# traefik v2
|
|
# http
|
|
- "traefik.http.routers.snappymail-http.entrypoints=web"
|
|
- "traefik.http.routers.snappymail-http.rule=Host(`snappymail.example.com`)"
|
|
- "traefik.http.routers.snappymail-http.middlewares=snappymail-http-myRedirectScheme" # Redirect http to https
|
|
- "traefik.http.middlewares.snappymail-http-myRedirectScheme.redirectScheme.scheme=https" # Redirect http to https
|
|
# https
|
|
- "traefik.http.routers.snappymail.entrypoints=websecure"
|
|
- "traefik.http.routers.snappymail.tls"
|
|
- "traefik.http.routers.snappymail.rule=Host(`snappymail.example.com`)"
|
|
- "traefik.http.services.snappymail.loadbalancer.server.port=8888"
|
|
expose:
|
|
- 8888
|
|
environment:
|
|
- DEBUG=true
|
|
volumes:
|
|
- snappymail:/var/lib/snappymail
|
|
networks:
|
|
- default
|
|
- traefik-network
|
|
restart: unless-stopped
|
|
|
|
# This provides prometheus metrics for snappymail's php-fpm
|
|
php-fpm-exporter:
|
|
image: hipages/php-fpm_exporter:2.2.0
|
|
ports:
|
|
- 9253:9253
|
|
environment:
|
|
- PHP_FPM_SCRAPE_URI=tcp://snappymail:9000/status
|
|
networks:
|
|
- default
|
|
|
|
networks:
|
|
default:
|
|
traefik-network:
|
|
name: traefik-network
|
|
|
|
volumes:
|
|
acme-volume:
|
|
driver: local
|
|
snappymail:
|
|
driver: local
|