mirror of
https://github.com/bulwarkmail/webmail.git
synced 2026-11-05 00:14:18 +00:00
Merge branch 'main' into feat/stalwart-1.0
# Conflicts: # CONTRIBUTING.md # LICENSE # README.md # app/api/calendar-agenda/route.ts # app/api/wopi/files/[fileId]/contents/route.ts # app/api/wopi/launch/route.ts # components/calendar/calendar-app.tsx # components/calendar/calendar-day-view.tsx # components/calendar/calendar-month-view.tsx # components/calendar/calendar-week-view.tsx # components/calendar/event-modal.tsx # components/contacts/contact-detail.tsx # components/email/email-composer.tsx # components/email/email-list.tsx # components/files/file-browser.tsx # components/files/files-app.tsx # components/files/folder-tree-sidebar.tsx # components/filters/filter-rule-modal.tsx # components/mail/mail-app.tsx # hooks/use-mailbox-drop.ts # integration/run-tests.sh # lib/__tests__/calendar-agenda-route.test.ts # lib/__tests__/jmap-draft-lifecycle.test.ts # lib/__tests__/web-push.test.ts # lib/account-state-manager.ts # lib/jmap/client-interface.ts # lib/jmap/client.ts # lib/jmap/types.ts # lib/message-list-order.ts # lib/sieve/generator.ts # lib/sieve/parser.ts # lib/telemetry/payload.ts # lib/thread-utils.ts # lib/unified-mailbox.ts # lib/web-push.ts # lib/wopi/token.ts # locales/ar/common.json # locales/ca/common.json # locales/cs/common.json # locales/da/common.json # locales/de/common.json # locales/en/common.json # locales/es/common.json # locales/fa/common.json # locales/fr/common.json # locales/he/common.json # locales/hu/common.json # locales/it/common.json # locales/ja/common.json # locales/ko/common.json # locales/lv/common.json # locales/mn/common.json # locales/nb/common.json # locales/nl/common.json # locales/pl/common.json # locales/pt/common.json # locales/ro/common.json # locales/ru/common.json # locales/sk/common.json # locales/tr/common.json # locales/uk/common.json # locales/zh-TW/common.json # locales/zh/common.json # scripts/lite/lib.mjs # stores/__tests__/calendar-store-synthetic-ids.test.ts # stores/__tests__/email-store-shared-folder-keywords.test.ts # stores/__tests__/email-store-unified-actions.test.ts # stores/__tests__/file-store.test.ts # stores/email-store.ts # stores/file-store.ts # stores/message-list-tabs-store.ts
This commit is contained in:
Linus Rath
+32
-2
@@ -28,7 +28,9 @@ JMAP_SERVER_URL=https://your-jmap-server.com
|
||||
# Offer several JMAP servers on the login form. JSON array; each entry needs
|
||||
# id, label, and url. "domains" and a per-server "oauth" block are optional.
|
||||
# Prefer configuring this from the admin dashboard - the env form exists for
|
||||
# stateless deployments.
|
||||
# stateless deployments. An "oauth" block with both "clientId" and
|
||||
# "buttonLabel" gives that server its own sign-in button on the login page,
|
||||
# even while OAuth is off globally.
|
||||
# JMAP_SERVERS=[{"id":"eu","label":"Europe","url":"https://eu.example.com","domains":["example.com"]},{"id":"us","label":"US","url":"https://us.example.com","oauth":{"clientId":"webmail-us"}}]
|
||||
|
||||
# Pick the server automatically from the domain of the address the user types,
|
||||
@@ -88,7 +90,9 @@ JMAP_SERVER_URL=https://your-jmap-server.com
|
||||
# OAUTH_POST_LOGOUT_REDIRECT_URI=https://mail.example.com/en/login
|
||||
|
||||
# Replace the scopes requested at authorization. Space-separated. Leave unset
|
||||
# to use the defaults the client already asks for.
|
||||
# to use the defaults: openid email profile. offline_access is not among them;
|
||||
# add it if your IdP (e.g. Authelia) only issues refresh tokens for it,
|
||||
# otherwise sessions end when the access token expires.
|
||||
# OAUTH_SCOPES=openid email profile offline_access
|
||||
|
||||
# Append scopes instead of replacing them. Use this when your IdP needs one
|
||||
@@ -148,6 +152,12 @@ JMAP_SERVER_URL=https://your-jmap-server.com
|
||||
# error than a mid-request EROFS). Pair with `:ro` on the config-volume mount.
|
||||
# ADMIN_CONFIG_READONLY=true
|
||||
#
|
||||
# Optional existing PEM PKCS#8 Ed25519 private key used to sign managed plugin
|
||||
# bundles. Bulwark reads this exact path without modifying it. Use a runtime
|
||||
# secret mount such as a systemd credential, Docker secret, or Kubernetes Secret.
|
||||
# When unset, Bulwark loads or creates ADMIN_CONFIG_DIR/plugin-signing.key.
|
||||
# PLUGIN_SIGNING_KEY_FILE=/run/secrets/plugin-signing-key
|
||||
#
|
||||
# Legacy: a single dir containing both config and state. Honoured if neither
|
||||
# of the split variables is set. New installs should use the split vars.
|
||||
# ADMIN_DATA_DIR=./data/admin
|
||||
@@ -292,6 +302,12 @@ LOGIN_COMPANY_NAME=Bulwark Webmail
|
||||
# URL for the company website link on the login page.
|
||||
LOGIN_WEBSITE_URL=https://bulwarkmail.org
|
||||
|
||||
# Where users get the source code of this build, linked from Settings >
|
||||
# About. Bulwark is AGPL-3.0-only: if you run a modified build, set this to
|
||||
# the source of exactly what you deploy (your fork, at the deployed commit).
|
||||
# Unset links to the upstream repository. Only http(s) URLs are used.
|
||||
# SOURCE_CODE_URL=https://git.example.com/acme/webmail/tree/v1.2.3
|
||||
|
||||
# Cap the login logo's rendered size. Any CSS length ("120px", "8rem").
|
||||
# Unset means the logo renders at its natural size.
|
||||
# LOGIN_LOGO_MAX_HEIGHT=96px
|
||||
@@ -306,6 +322,11 @@ LOGIN_WEBSITE_URL=https://bulwarkmail.org
|
||||
# still shows it regardless of this setting.
|
||||
# LOGIN_SHOW_TOTP=false
|
||||
#
|
||||
# Offer "Sign in with an access token" (default false). For JMAP servers
|
||||
# that authenticate API tokens as Bearer tokens instead of passwords, such
|
||||
# as Fastmail (JMAP_SERVER_URL=https://api.fastmail.com).
|
||||
# LOGIN_SHOW_TOKEN_LOGIN=true
|
||||
#
|
||||
# Hide the version number, so it isn't disclosed to unauthenticated visitors.
|
||||
# LOGIN_SHOW_VERSION=false
|
||||
|
||||
@@ -370,6 +391,10 @@ LOGIN_WEBSITE_URL=https://bulwarkmail.org
|
||||
# How many trusted reverse proxies sit in front of the app. The client IP is
|
||||
# taken that many entries from the right of X-Forwarded-For, so an attacker
|
||||
# can't spoof it by prepending values. Default: 1.
|
||||
# Without any reverse proxy the header is whatever the client sends, so
|
||||
# per-IP limits and audit-log addresses can be forged; admin sign-in then
|
||||
# still stops at 50 attempts per 15 minutes across all clients. Put the
|
||||
# app behind a proxy that appends X-Forwarded-For.
|
||||
# TRUSTED_PROXY_DEPTH=2
|
||||
|
||||
# Allow search engines to index the app (robots.txt / noindex). Default: false.
|
||||
@@ -450,6 +475,11 @@ LOGIN_WEBSITE_URL=https://bulwarkmail.org
|
||||
# them unset keeps the feature fully off. Treat the secret and the master
|
||||
# password as you would a root credential.
|
||||
#
|
||||
# The master password never leaves the server: each handoff uses it once to
|
||||
# create an app password on the target mailbox, valid for 8 hours and
|
||||
# revoked on sign-out. The target account's role therefore needs the
|
||||
# app-password permissions (Stalwart's default user role has them).
|
||||
#
|
||||
# BULWARK_JWT_AUTH_SECRET= # required, >= 32 characters
|
||||
# BULWARK_STALWART_MASTER_USER= # required, e.g. master@example.com
|
||||
# BULWARK_STALWART_MASTER_PASSWORD= # required
|
||||
|
||||
Reference in New Issue
Block a user