diff --git a/.env.example b/.env.example index 580013b..7839a1c 100644 --- a/.env.example +++ b/.env.example @@ -75,7 +75,7 @@ APP_NAME=ihasmail # you have patched it, point this at your own tree. Shown on the sign-in page # and in Settings > About. INBUXA's webmail is itself a modified ihasmail, so # the default is this fork. -SOURCE_URL=https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa +SOURCE_URL=https://git.coffeylabs.org/inbuxa/inbuxa-webmail # ---- Settings this installation decides (all optional) ---- # diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index c1fec69..aeb99ca 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -133,7 +133,7 @@ jobs: echo "DOCKER_TAG=${V/+/-}" >> "$GITHUB_OUTPUT" echo "VERSION=$V DOCKER_TAG=${V/+/-}" - # Multi-arch image at /inbuxa/ihasmail-inbuxa, then the release. + # Multi-arch image at /inbuxa/inbuxa-webmail, then the release. # arm64 is built under QEMU on this amd64 host, which is slow but fine for # a hand-cut release. PACKAGE_TOKEN (jcoffey-dev, write:package) logs in: # the job's own token is refused by the container registry. The release is diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ee30f4..0d6140d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ env: GITEA_URL: ${{ vars.GITEA_URL }} REGISTRY: ${{ vars.REGISTRY }} # A registry path must be lowercase; the repository name already is. - IMAGE: ${{ vars.REGISTRY }}/inbuxa/ihasmail-inbuxa + IMAGE: ${{ vars.REGISTRY }}/inbuxa/inbuxa-webmail # A tag's context names the tag: upstream v* and inbuxa-v* tags can sit on # the same commit, and Gitea must not read one tag's result as the other's. STATUS_CONTEXT: github/ci (${{ github.ref_type == 'tag' && format('tag {0}', github.ref_name) || 'branch' }}) @@ -222,7 +222,7 @@ jobs: GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} run: | curl -fsS -o /dev/null -X POST -H "Authorization: token $GITEA_TOKEN" \ - "$GITEA_URL/api/v1/packages/inbuxa/container/ihasmail-inbuxa/-/link/ihasmail-inbuxa" \ + "$GITEA_URL/api/v1/packages/inbuxa/container/inbuxa-webmail/-/link/inbuxa-webmail" \ || echo "package already linked (or link refused); not fatal" - env: GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} diff --git a/README.md b/README.md index 7218f5f..c0b6077 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,10 @@

> [!NOTE] -> Development happens on [git.coffeylabs.org/inbuxa/ihasmail-inbuxa](https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa); the copy on GitHub is a read-only mirror. -> Report issues at **[git.coffeylabs.org/inbuxa/ihasmail-inbuxa/issues](https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa/issues)**, and join discussions at **[community.coffeylabs.org](https://community.coffeylabs.org)**. +> Development happens on [git.coffeylabs.org/inbuxa/inbuxa-webmail](https://git.coffeylabs.org/inbuxa/inbuxa-webmail); the copy on GitHub is a read-only mirror. +> Report issues at **[git.coffeylabs.org/inbuxa/inbuxa-webmail/issues](https://git.coffeylabs.org/inbuxa/inbuxa-webmail/issues)**, and join discussions at **[community.coffeylabs.org](https://community.coffeylabs.org)**. +> +> This repository was called `ihasmail-inbuxa` until October 2026. Container images are now published as `inbuxa/inbuxa-webmail`; the old `inbuxa/ihasmail-inbuxa` image stops at `2026.9.26-g654d298`. The webmail of the INBUXA suite: mail, calendars, contacts, files and filters in one app that works as well on a phone as on a desktop. It talks only JMAP to @@ -74,7 +76,7 @@ docker compose up --build -d ## Source code INBUXA webmail is a modified ihasmail, so the AGPL's offer is this fork: -. The sign-in page and Settings › +. The sign-in page and Settings › About link there, beside the version, which names the commit the running build came from. diff --git a/docker-compose.yml b/docker-compose.yml index 0fbe737..b9311ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: APP_SECRET: ${APP_SECRET:?set APP_SECRET in .env (openssl rand -base64 48)} APP_NAME: ${APP_NAME:-ihasmail} BASE_PATH: ${BASE_PATH:-} - SOURCE_URL: ${SOURCE_URL:-https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa} + SOURCE_URL: ${SOURCE_URL:-https://git.coffeylabs.org/inbuxa/inbuxa-webmail} TRUST_PROXY: "1" IMAGE_PROXY: "1" volumes: diff --git a/server/src/config.ts b/server/src/config.ts index fbeedbb..9a4be28 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -292,10 +292,10 @@ export const config = { * * The AGPL asks whoever *runs* a modified version to offer that version's * source, not the one it was forked from -- so anyone deploying a patched - * ihasmail should point this at their own tree. ihasmail-inbuxa is itself + * ihasmail should point this at their own tree. inbuxa-webmail is itself * such a tree, so the default is INBUXA's fork. */ - sourceUrl: env("SOURCE_URL", "https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa"), + sourceUrl: env("SOURCE_URL", "https://git.coffeylabs.org/inbuxa/inbuxa-webmail"), /** * ihasmail-inbuxa: this webmail's own name, shown in Settings > About next * to the mail node it talks to. Set per host by the deploy; empty means the diff --git a/web/src/lib/source.ts b/web/src/lib/source.ts index 5c05fbb..de1790b 100644 --- a/web/src/lib/source.ts +++ b/web/src/lib/source.ts @@ -8,4 +8,4 @@ * ihasmail-inbuxa: INBUXA runs a modified ihasmail, so the offer is INBUXA's * fork and not the project it came from. */ -export const DEFAULT_SOURCE_URL = "https://git.coffeylabs.org/inbuxa/ihasmail-inbuxa"; +export const DEFAULT_SOURCE_URL = "https://git.coffeylabs.org/inbuxa/inbuxa-webmail";