1
0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Commit Graph

244 Commits

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