1
0
Fork 0

157 Commits (90c96bdddc5377d9fc2216ef47bc2e09836d9a7b)

Autor SHA1 Nachricht Datum
Jonathan Elias Caicedo 8661919374
Fix 'coma' -> 'comma' vor 7 Jahren
hoellen 463bbda302 Allow subnet with host bit set in setup vor 7 Jahren
bors[bot] 2d4c837761 Merge #1015
1015: Merge DNS hints, and hostname/domain ordering hints. r=Nebukadneza a=toxik-io

## Enhancement - Hints in setup, references in setup & DNS docs

Unrelated: This PR makes changes to the Flask setup utilities to suggest ordering the `HOSTNAMES` 
entry so that the first entry is the admin panel's domain (at least in my experience that's what fixed my
issues)

It also makes changes to the documentation, referencing that more than the usual DNS
entries need to be set (and the admin panel used) if they've enabled DMARC/SPF/DKIM.

### Related issue(s)
- My original issue #1002

## Prerequistes

- [x] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.

## Assistance
I'm unsure if the hints for HOSTNAME ordering are simply because of how the config is gulped in
by the current tooling, or if it's a bug that the frontend only accepts connections from the first host...

I also don't know what commands in the CLI would replicate the steps taken on the admin dashboard.

Further, I don't know what you'd put in the changelog.

Co-authored-by: toxik-io <thetoxicarcade@gmail.com>
vor 7 Jahren
bors[bot] 8ffe947f39 Merge #939
939: Removed commented options in env file r=mergify[bot] a=ionutfilip

## What type of PR?
Enhancement

## What does this PR do?
Remove all commented options from env file

### Related issue(s)
- #858
- #895

## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: place entry in the [changelog](CHANGELOG.md), under the latest un-released version.


Co-authored-by: Ionut Filip <ionut.philip@gmail.com>
vor 7 Jahren
bors[bot] ce12c4979d Merge #964
964: Create overrides/nginx r=mergify[bot] a=jeremyVignelles

## What type of PR?

documentation

## What does this PR do?
Updates the procedure to include the creation of that required folder

## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [X] In case of feature or enhancement: documentation updated accordingly
- [X] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/guide.html#changelog) entry file.


Co-authored-by: Jérémy VIGNELLES <jeremyvignelles@users.noreply.github.com>
vor 7 Jahren
bors[bot] 0e182fde3f Merge #957
957: Correct hardcoded WEBROOT_REDIRECT r=mergify[bot] a=ahwebd

We should not assume that the user has chosen the word "webmail" for his webmail path.

Co-authored-by: Ahmed H <ahwebd@gmail.com>
vor 7 Jahren
toxik-io ca5e0c88ba
update in stack, as well. vor 7 Jahren
toxik-io f1eb2ee367
solve admin problems by recommending it in setup, not just FAQ. vor 7 Jahren
Jérémy VIGNELLES b1621d4b63
Create overrides/nginx
This folder is needed for the front service to be able to start, because a bind-mount is made on that folder.
vor 7 Jahren
Ahmed H 52948fa529
Correct hardcoded WEBROOT_REDIRECT
We should not assume that the user has chosen the word "webmail" for his webmail path
vor 7 Jahren
Ionut Filip 131406774b Handle setup subnet error vor 7 Jahren
Ionut Filip 4df36bea91 Removed commented options vor 7 Jahren
bors[bot] 86b4242f82 Merge #886
886: Ipv6 support r=mergify[bot] a=muhlemmer

## What type of PR?

(Feature, enhancement, bug-fix, documentation) -> A bit of everything

## What does this PR do?

Document how to use ipv6nat. This, however triggers some kind of flaky behavior with the Docker DNS resolver, resulting in lookup failures between containers.  So all resolving needs to be done during container startup/configuration.

In order not to pollute every single start.py file, we've created a small library called [Mailu/MailuStart](https://github.com/Mailu/MailuStart). As an addition, this library also defines the template generation function, including its logging facility.

Note: `docker-compose.yml` downgrade is necessary, as IPv6 settings are not supported by the Docker Compose file format 3 😞  

### Related issue(s)
Supersedes  PR #844
- Fixes #827 
- Hopefully helps with #829 and #834

## No backport yet

This PR directly imports MailuStart from git. This makes it a bit more simple to implement on the short term an do some testing and probably some future improvements. When everything is proved stable, we will create a proper PyPi package with versioning and consider back porting.

## Prerequistes
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: place entry in the [changelog](CHANGELOG.md), under the latest un-released version.


Co-authored-by: Ionut Filip <ionut.philip@gmail.com>
Co-authored-by: Tim Möhlmann <muhlemmer@gmail.com>
vor 7 Jahren
bors[bot] 4d58b322bc Merge #888 #889
888: Correct the URL users are directed to after using setup without exposing /admin r=mergify[bot] a=Nebukadneza

In setup, users who didn’t expose `/admin` were directed to `http://127.0.0.1:8080/`, which was missing `/ui` to work.

Also, let’s help out the less apt admins by providing a copy-paste template for ssh-tunnelling.

## What type of PR?
documentation

### Related issue(s)
closes #885

## Prerequistes
- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: place entry in the [changelog](CHANGELOG.md), under the latest un-released version.


889: Catch webmail-url empty but webmail configured and force to default r=mergify[bot] a=Nebukadneza

## What type of PR?
bug-fix

## What does this PR do?
Quite some users managed to delete the contents of the webmail-url field in
setup, which forces front into a restart loop. Catch the case where a webmail
service is configured, but url is empty — and force to default /webmail.

### Related issue(s)
closes #856

## Prerequistes
- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: place entry in the [changelog](CHANGELOG.md), under the latest un-released version.


Co-authored-by: Dario Ernst <dario@kanojo.de>
vor 7 Jahren
Dario Ernst ef5a114cff Put webmail on / for empty webmail_path from setup vor 7 Jahren
Dario Ernst 0676252ec1 Revert accidental setup commits and fix code/pre tags vor 7 Jahren
Dario Ernst d9d6f514aa Catch webmail-url empty but webmail configured and force to default
Quite some users managed to delete the contents of the webmail-url field in
setup, which forces front into a restart loop. Catch the case where a webmail
service is configured, but url is empty — and force to default /webmail.

closes #856
vor 7 Jahren
Dario Ernst 392637e16a Correct the URL users are directed to after using setup without exposing /admin
closes #885
vor 7 Jahren
Jim Heald eb8d84aed0 Fix environment variable inconsistency vor 7 Jahren
Ionut Filip bbbd22b3a3
Merge pull request #843 from usrpro/fix-unbound-swarm
Remove unbound from swarm
vor 7 Jahren
Tim Möhlmann 3460872747
Documentation on IPv6 vor 7 Jahren
Ionut Filip 3ae1c75c55
Added IPv6 as optional vor 7 Jahren
Ionut Filip f7e37b7d4b
Removed unbound resolver for stack flavor vor 7 Jahren
Ionut Filip 9bec86f2c3 Fixed TLD limitation vor 7 Jahren
Tim Möhlmann 38e754be6d
Make docs refer to the setup utility vor 7 Jahren
Tim Möhlmann 1975534125
Make docker-compose.yml for setup and docs development friendly
This enables easy local running.
Actual deployment files are moved to github.com/mailu/infra.
vor 7 Jahren
Ionut Filip 50343f354e Merge remote-tracking branch 'upstream/master' into feat-psql-support vor 7 Jahren
Ionut Filip 37a07e3297 Update setup utility with mysql db flavor vor 7 Jahren
Tim Möhlmann 7d01bb2a4d
LOG_LEVEL docs and changelog entry vor 7 Jahren
Ionut Filip 9077bf7313 Merge remote-tracking branch 'upstream/master' into feat-psql-support vor 7 Jahren
Tim Möhlmann cffc7c15f1
Merge remote-tracking branch 'upstream/master' into fix-setup-filegen vor 7 Jahren
Tim Möhlmann 738d98e5ab
Fix code formatting vor 7 Jahren
Tim Möhlmann b2823c23b8
Merge remote-tracking branch 'upstream/master' into feat-psql-support vor 7 Jahren
Daniel Huber b4f6f6b354
Merge branch 'master' into fix-docker-prefix vor 7 Jahren
Tim Möhlmann c1bfde4e15
Use wget for file dowloads. Curl doesn't like the Traefik redirects vor 7 Jahren
Tim Möhlmann 598ad4fc7a
Prefix static path with version for Traefik vor 7 Jahren
Tim Möhlmann 19bd90f581
Fix usage of radicale image instead of none
I just noticed that the `none` image was used in place where `radicale` should be used. Fixed in this commit.
vor 7 Jahren
Daniel Huber d357ed67f5
Add DOCKER_PREFIX in tests and setup files vor 7 Jahren
Daniel Huber 736607ab0c
Update admin account create command in setup utility to use the flask cli vor 7 Jahren
Ionut Filip 1b64c80612 Managing different blueprint prefixes vor 7 Jahren
Tim Möhlmann 8c6e0c56fb
Fix redis connection errors vor 7 Jahren
Ionut Filip 5e2552bcd5 Removed if block vor 7 Jahren
Tim Möhlmann e994fefb2d
Remove the test branch vor 7 Jahren
Tim Möhlmann 1df3b46454
Use ADDRESS instead of HOSTNAME vor 7 Jahren
Tim Möhlmann 8ef0493f53
Define external web network for Traefik connections vor 7 Jahren
Tim Möhlmann db9a3787b1
Disable healthcheck, doen't work in versioned env vor 7 Jahren
Tim Möhlmann 3655c7c902
Merge remote-tracking branch 'origin/fix-setup-bugs' into setup-deploy vor 7 Jahren
Tim Möhlmann 9c284c4004
Prepare setup for multi-ver deployment on docs server vor 7 Jahren
Ionut Filip bb0fd896b3 Fix some bugs in setup for stack flavor
- Unbound and webmail images were hardcoded
- Removed unnecesary environment keyword
vor 7 Jahren
kaiyou f6520eace6 Merge branch 'feat-psql-support' of https://github.com/usrpro/Mailu into usrpro-feat-psql-support vor 7 Jahren
Tim Möhlmann c7dcfee882
Merge pull request #713 from pgeorgi/extend-nginx
nginx: Allow extending config with overrides
vor 7 Jahren
mergify-bot 491f6b24bb Merge branch 'master' into 'feat-subnet2' vor 7 Jahren
Tim Möhlmann c00910ca4b
Merge remote-tracking branch 'upstream/master' into extend-nginx vor 7 Jahren
Tim Möhlmann c25ba75d68
Include WEBROOT_REDIRECT in setup templates vor 7 Jahren
Ionut Filip 94edb48f08 Dynamic attachment size vor 7 Jahren
Tim Möhlmann c0972face6
Correct subnetting functionality for the tests and setup vor 7 Jahren
Tim Möhlmann 8172f3eab8
Move the Mailu Docker network to a fixed subnet.
This will make network configuration and host based authentication
more robust, across different deployment platforms.
The options `RELAYNETS` and`POD_ADDRESS_RANGE` are kept for compatibility.
However, their usage have become optional.
vor 7 Jahren
Ionut Filip 7809d1373a Moved postgresql image in optional vor 7 Jahren
Ionut Filip dd16ed4cba Removed password hashing vor 7 Jahren
Tim Möhlmann 2b6f5ea3d0
Update setup's own docker-compose.yml file vor 7 Jahren
Ionut Filip 92bdc6e0a3 Added network if postgresql used vor 7 Jahren
Ionut Filip fa879dd9ab Removed empty space vor 7 Jahren
Ionut Filip e89d354834 Encrypted input db password vor 7 Jahren
Ionut Filip ef6a0727ac Updated setup with optional psql db vor 7 Jahren
Ionut Filip 2a76451a98 Moved scripts to an external js file vor 7 Jahren
Tim Möhlmann ca4804653d
Merge branch 'master' into feat-setup vor 7 Jahren
Ionut Filip ffdef18bd6 Rendering admin/webmail path based on checkbox value vor 7 Jahren
Tim Möhlmann 1e3392e417
Antispam not an optional service, postfix fails without it vor 7 Jahren
Tim Möhlmann 72e931f4b4
Modify setup templates to allow for DOCKER_ORG and VERSION override. (Needed for Travis) vor 7 Jahren
Tim Möhlmann 55297424cd
Merge remote-tracking branch 'upstream/master' into feat-setup vor 7 Jahren
Tim Möhlmann b8783b670a
Take out DNS entry for webmail vor 7 Jahren
Ionut Filip e5268de0c7 Revert default value for subnet vor 7 Jahren
Ionut Filip 120c29eff6 Added unbound for stack flavor vor 7 Jahren
Ionut Filip ae8f928fc0 Added project name on docker commands vor 7 Jahren
Ionut Filip 6c12e2fffb Fixed subnet variable in unbound vor 7 Jahren
Ionut Filip da37555a3c Fixed naming error vor 7 Jahren
Ionut Filip 7c07efc216 Added unbound to setup
- Added checkbox for unbound resolver
- Added subnet variable
- Added dns variable which is generating the ip address based on subnet
vor 7 Jahren
Ionut Filip 3c9cae5d06 Added replicas variables for core containers
- Added back restart: always on compose flavor
- Moved Log driver from .env to docker-compose.yml
vor 7 Jahren
Ionut Filip 6a9e5c1921 Create/generate file template vor 7 Jahren
Ionut Filip 9881dd2074 Documentation for adding more steps/flavors vor 7 Jahren
Tim Möhlmann 81b24f61e8
Merge branch 'master' into feat-healthchecks vor 7 Jahren
Ionut Filip c5be360a48 Updated setup page for stack flavor vor 7 Jahren
Ionut Filip ebaba8fb41 Moved variables from docker-compose.yml back to env file vor 7 Jahren
Ionut Filip 9c56e4c1b6 Fixed misstyped condition vor 7 Jahren
Ionut Filip 02c802159a Updated env file with the latest version vor 7 Jahren
Tim Möhlmann 84c6b12d06
Updated labels in config page vor 7 Jahren
Ionut Filip 08987dfa22 Minor changes vor 7 Jahren
Ionut Filip 35193f5530 Added functionality for stack flavor vor 7 Jahren
Tim Möhlmann 39a1de956f
Add docker stack flavor
- Template still untested
- mailu.env and setup.html are symbolic links to compose flavor
vor 7 Jahren
Tim Möhlmann adfadab4cf
Load steps after setting flavor vor 7 Jahren
Tim Möhlmann 5679d355aa
Avoid binding conflicts on production servers vor 7 Jahren
Tim Möhlmann b2059be966
Merge branch 'feat-setup' of github.com:usrpro/Mailu into feat-setup vor 7 Jahren
Tim Möhlmann ed53d655d3
Extend documentation in download page. Small cleanup in env. vor 7 Jahren
Ionut Filip 7c0f5b20d6 Bug fixes vor 7 Jahren
Ionut Filip cb1ed349bf Bug fixes vor 7 Jahren
Ionut Filip 6b6cbcf977 Modified variables in .env file vor 7 Jahren
Ionut Filip b3c7c45140 Added input form constraints vor 7 Jahren
Thomas Sänger 39272ab05c
add healthcheck for http services vor 7 Jahren
Ionut Filip b9ecc0ccc6 Added minor changes vor 7 Jahren
Ionut Filip e8dee22ecf Added vars and fixed naming use vor 7 Jahren