Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ FROM base AS vendor
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY composer.json composer.lock ./
# The database backup package is a path repository, so Composer needs it here.
COPY packages ./packages

# Resolve dependencies before the source lands so this layer survives ordinary
# code edits. --no-scripts and --no-autoloader because post-autoload-dump runs
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ SCOPE AND OTHER LICENSES
===============================================================================

Third-party material in this repository keeps its own license and notices; see
THIRD_PARTY_NOTICES.md. The package in packages/abduns/laravel-db-backup is
licensed separately under the MIT License.
THIRD_PARTY_NOTICES.md.

The copyright holder also offers Maildun under separate commercial terms, for
example to keep modifications private or to omit the author attribution. A
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ Running an unmodified Maildun, for your own organization or as a hosted service

If you need other terms, for example to keep your modifications private while offering Maildun over a network, or to ship it without the author attribution, a separate commercial license is available: **werk@abduns.com**. It covers Maildun's own code only.

Third-party packages, artwork, and trademarks remain subject to their own terms; see [Third-party notices](THIRD_PARTY_NOTICES.md). The bundled `packages/abduns/laravel-db-backup` package is MIT licensed.
Third-party packages, artwork, and trademarks remain subject to their own terms; see [Third-party notices](THIRD_PARTY_NOTICES.md).
2 changes: 1 addition & 1 deletion THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ The animated background presets (Matrix, Grid, Orbit, Glow) are drawn by Maildun

## Database backup package

`packages/abduns/laravel-db-backup` is a separate package by Maildun's copyright holder, licensed under the MIT License (see its `LICENSE`), not under Maildun's AGPL terms.
Maildun depends on [`abduns/laravel-db-backup`](https://github.com/abduns/laravel-db-backup), a separate package by Maildun's copyright holder, installed through Composer and licensed under the MIT License, not under Maildun's AGPL terms.

## Developer tooling

Expand Down
15 changes: 2 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"require": {
"php": "^8.4",
"abduns/laravel-db-backup": "@dev",
"abduns/laravel-db-backup": "^1.0",
"aws/aws-php-sns-message-validator": "^1.10",
"aws/aws-sdk-php": "^3.393",
"dicebear/core": "^10.6",
Expand Down Expand Up @@ -137,16 +137,5 @@
}
},
"minimum-stability": "stable",
"prefer-stable": true,
"repositories": [{
"name": "db-backup",
"type": "path",
"url": "packages/abduns/laravel-db-backup",
"options": {
"symlink": true,
"versions": {
"abduns/laravel-db-backup": "dev-main"
}
}
}]
"prefer-stable": true
}
42 changes: 25 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ This guide installs Maildun for local development or evaluation. Read [Productio
- An application-wide mail relay for system email
- An Amazon SES or SMTP account for each workspace that will send email

The bundled `abduns/laravel-db-backup` package installs from the `packages/` directory through a Composer path repository. Deploy the whole repository, including `packages/`, or `composer install` cannot resolve it.

The default `.env.example` uses SQLite, Redis queues, Redis cache, and a local SMTP relay on port 2525. That relay is only a development default; it is not suitable for a public installation.

## Configure email delivery
Expand Down
2 changes: 1 addition & 1 deletion docs/production.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Losing `APP_KEY` makes encrypted workspace provider settings and tokens unreadab

### Database backups

Maildun bundles `abduns/laravel-db-backup`, which is off by default. To let the scheduler back up the database, set:
Maildun ships with [`abduns/laravel-db-backup`](https://github.com/abduns/laravel-db-backup), which is off by default. To let the scheduler back up the database, set:

```dotenv
DB_BACKUP_SCHEDULE=true
Expand Down
4 changes: 0 additions & 4 deletions packages/abduns/laravel-db-backup/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions packages/abduns/laravel-db-backup/LICENSE

This file was deleted.

180 changes: 0 additions & 180 deletions packages/abduns/laravel-db-backup/README.md

This file was deleted.

Loading
Loading