Commit Graph

195 Commits (b9b0c77d2ed683a1de793e22ff3fb06cf720b344)

Author SHA1 Message Date
bors[bot] 86b4242f82 Merge
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 
- Fixes  
- Hopefully helps with  and 

## 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>
bors[bot] 4d58b322bc Merge
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 

## 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 

## 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>
Dario Ernst ef5a114cff Put webmail on / for empty webmail_path from setup
Dario Ernst 0676252ec1 Revert accidental setup commits and fix code/pre tags
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 
Dario Ernst 392637e16a Correct the URL users are directed to after using setup without exposing /admin
closes 
Jim Heald eb8d84aed0 Fix environment variable inconsistency
Ionut Filip bbbd22b3a3
Merge pull request from usrpro/fix-unbound-swarm
Remove unbound from swarm
Tim Möhlmann 3460872747
Documentation on IPv6
Ionut Filip 3ae1c75c55
Added IPv6 as optional
Ionut Filip f7e37b7d4b
Removed unbound resolver for stack flavor
Ionut Filip 9bec86f2c3 Fixed TLD limitation
Tim Möhlmann 38e754be6d
Make docs refer to the setup utility
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.
Ionut Filip 50343f354e Merge remote-tracking branch 'upstream/master' into feat-psql-support
Ionut Filip 37a07e3297 Update setup utility with mysql db flavor
Tim Möhlmann 7d01bb2a4d
LOG_LEVEL docs and changelog entry
Ionut Filip 9077bf7313 Merge remote-tracking branch 'upstream/master' into feat-psql-support
Tim Möhlmann cffc7c15f1
Merge remote-tracking branch 'upstream/master' into fix-setup-filegen
Tim Möhlmann 738d98e5ab
Fix code formatting
Tim Möhlmann b2823c23b8
Merge remote-tracking branch 'upstream/master' into feat-psql-support
Daniel Huber b4f6f6b354
Merge branch 'master' into fix-docker-prefix
Tim Möhlmann c1bfde4e15
Use wget for file dowloads. Curl doesn't like the Traefik redirects
Tim Möhlmann 598ad4fc7a
Prefix static path with version for Traefik
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.
Daniel Huber d357ed67f5
Add DOCKER_PREFIX in tests and setup files
Daniel Huber 736607ab0c
Update admin account create command in setup utility to use the flask cli
Ionut Filip 1b64c80612 Managing different blueprint prefixes
Tim Möhlmann 8c6e0c56fb
Fix redis connection errors
Ionut Filip 5e2552bcd5 Removed if block
Tim Möhlmann e994fefb2d
Remove the test branch
Tim Möhlmann 1df3b46454
Use ADDRESS instead of HOSTNAME
Tim Möhlmann 8ef0493f53
Define external web network for Traefik connections
Tim Möhlmann db9a3787b1
Disable healthcheck, doen't work in versioned env
Tim Möhlmann 3655c7c902
Merge remote-tracking branch 'origin/fix-setup-bugs' into setup-deploy
Tim Möhlmann 9c284c4004
Prepare setup for multi-ver deployment on docs server
Ionut Filip bb0fd896b3 Fix some bugs in setup for stack flavor
- Unbound and webmail images were hardcoded
- Removed unnecesary environment keyword
kaiyou f6520eace6 Merge branch 'feat-psql-support' of https://github.com/usrpro/Mailu into usrpro-feat-psql-support
Tim Möhlmann c7dcfee882
Merge pull request from pgeorgi/extend-nginx
nginx: Allow extending config with overrides
mergify-bot 491f6b24bb Merge branch 'master' into 'feat-subnet2'
Tim Möhlmann c00910ca4b
Merge remote-tracking branch 'upstream/master' into extend-nginx
Tim Möhlmann c25ba75d68
Include WEBROOT_REDIRECT in setup templates
Ionut Filip 94edb48f08 Dynamic attachment size
Tim Möhlmann c0972face6
Correct subnetting functionality for the tests and setup
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.
Ionut Filip 7809d1373a Moved postgresql image in optional
Ionut Filip dd16ed4cba Removed password hashing
Tim Möhlmann 2b6f5ea3d0
Update setup's own docker-compose.yml file
Ionut Filip 92bdc6e0a3 Added network if postgresql used
Ionut Filip fa879dd9ab Removed empty space
Ionut Filip e89d354834 Encrypted input db password
Ionut Filip ef6a0727ac Updated setup with optional psql db
Ionut Filip 2a76451a98 Moved scripts to an external js file
Tim Möhlmann ca4804653d
Merge branch 'master' into feat-setup
Ionut Filip ffdef18bd6 Rendering admin/webmail path based on checkbox value
Tim Möhlmann 1e3392e417
Antispam not an optional service, postfix fails without it
Tim Möhlmann 72e931f4b4
Modify setup templates to allow for DOCKER_ORG and VERSION override. (Needed for Travis)
Tim Möhlmann 55297424cd
Merge remote-tracking branch 'upstream/master' into feat-setup
Tim Möhlmann b8783b670a
Take out DNS entry for webmail
Ionut Filip e5268de0c7 Revert default value for subnet
Ionut Filip 120c29eff6 Added unbound for stack flavor
Ionut Filip ae8f928fc0 Added project name on docker commands
Ionut Filip 6c12e2fffb Fixed subnet variable in unbound
Ionut Filip da37555a3c Fixed naming error
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
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
Ionut Filip 6a9e5c1921 Create/generate file template
Ionut Filip 9881dd2074 Documentation for adding more steps/flavors
Tim Möhlmann 81b24f61e8
Merge branch 'master' into feat-healthchecks
Ionut Filip c5be360a48 Updated setup page for stack flavor
Ionut Filip ebaba8fb41 Moved variables from docker-compose.yml back to env file
Ionut Filip 9c56e4c1b6 Fixed misstyped condition
Ionut Filip 02c802159a Updated env file with the latest version
Tim Möhlmann 84c6b12d06
Updated labels in config page
Ionut Filip 08987dfa22 Minor changes
Ionut Filip 35193f5530 Added functionality for stack flavor
Tim Möhlmann 39a1de956f
Add docker stack flavor
- Template still untested
- mailu.env and setup.html are symbolic links to compose flavor
Tim Möhlmann adfadab4cf
Load steps after setting flavor
Tim Möhlmann 5679d355aa
Avoid binding conflicts on production servers
Tim Möhlmann b2059be966
Merge branch 'feat-setup' of github.com:usrpro/Mailu into feat-setup
Tim Möhlmann ed53d655d3
Extend documentation in download page. Small cleanup in env.
Ionut Filip 7c0f5b20d6 Bug fixes
Ionut Filip cb1ed349bf Bug fixes
Ionut Filip 6b6cbcf977 Modified variables in .env file
Ionut Filip b3c7c45140 Added input form constraints
Thomas Sänger 39272ab05c
add healthcheck for http services
Ionut Filip b9ecc0ccc6 Added minor changes
Ionut Filip e8dee22ecf Added vars and fixed naming use
Ionut Filip 0d164486b4 docker-compose variables and setup
Tim Möhlmann 11a8e49f05
Compose file upgrade and define more variables for setup
kaiyou 4b60ee5361
Merge pull request from usrpro/fix-setup-binding
Fix binding in setup utility's gunicorn
Tim Möhlmann fe7e32dc82
Make gunicorn bind to port 80 of any available protocol
Tim Möhlmann 6fc51d879b
Add docker-compose.yml file for Setup utility
kaiyou d4cc142f64 Rename the config dir to setup
kaiyou f5538698d3 Rename the config dir to setup