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

1450 Commits

Author SHA1 Message Date
Tim Möhlmann
598ad4fc7a
Prefix static path with version for Traefik 2018-12-30 20:52:34 +02: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
Tim Möhlmann
be7dc1e6bd
Merge pull request #753 from usrpro/deploy-docks
Add deploy settings for server
2018-12-17 00:13:35 +02:00
Tim Möhlmann
533a6f8faa
Add deploy settings for server 2018-12-17 00:12:21 +02:00
Tim Möhlmann
c0645eadef
Remove healthcheck
Did not work correctly and prevents Traefik from serving the page.
2018-12-17 00:04:55 +02:00
Tim Möhlmann
d96debb2a6
Merge pull request #752 from usrpro/setup-deploy
Setup deploy
2018-12-16 23:29:59 +02:00
Tim Möhlmann
e994fefb2d
Remove the test branch 2018-12-16 23:28:15 +02:00
kaiyou
66844fbca8
Merge pull request #750 from usrpro/fix-mailu_version_docs
Use MAILU_VERSION from Travis for Docs build
2018-12-16 22:27:52 +01: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
Tim Möhlmann
a5d6acfb96
Use MAILU_VERSION from Travis for Docs build 2018-12-15 21:40:00 +02:00
Tim Möhlmann
3c4ee1b31e
Merge pull request #743 from kaiyou/master
Fixes #738 regarding application context
2018-12-14 11:09:27 +02:00
ofthesun9
97b3a85090
Merge pull request #737 from hoellen/fix-alias-match-behaviour
fix alias match behaviour
2018-12-13 20:34:09 +01:00
mergify-bot
09a50b6cfc Merge branch 'master' into 'master' 2018-12-13 19:14:20 +01:00
mergify[bot]
5795d8be16
Merge pull request #744 from kaiyou/fix-remove-debug
Remove some forgotten debugging, fix #720
2018-12-13 16:40:31 +00:00
kaiyou
4060ac2223 Remove some forgotten debugging 2018-12-13 15:19:34 +01:00
kaiyou
087841d5b7 Fix the way we handle the application context
The init script was pushing an application context, which maked
flask.g global and persisted across requests. This was evaluated
to have a minimal security impact.

This explains/fixes #738: flask_wtf caches the csrf token in the
application context to have a single token per request, and only
sets the session attribute after the first generation.
2018-12-13 14:23:17 +01:00
kaiyou
b5f51b0e2e Update python dependencies 2018-12-13 14:10:43 +01:00
mergify[bot]
0f4ba39141
Merge pull request #741 from usrpro/fix-networks-bug
Fixed networks indentation
2018-12-12 08:45:27 +00:00
Ionut Filip
514d179db1 Fixed networks indentation 2018-12-11 17:40:36 +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
hoellen
8fe9e695f3 prefer non-wildcard aliases over wildcard aliases 2018-12-10 08:40:10 +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
hoellen
79768c09f6 fix alias matching behaviour 2018-12-09 19:49:23 +01:00
mergify[bot]
74693ee47c
Merge pull request #736 from usrpro/clamav-health-start
Increase health start period for clamav's DB download
2018-12-09 18:17:42 +00:00
Tim Möhlmann
c1839b1ec1
Increase health start period for clamav's DB download 2018-12-08 23:47:37 +02:00
Tim Möhlmann
6ca8ed437d
Merge pull request #732 from Nebukadneza/add_front_certificate_reload
Add certificate watcher for external certs to reload nginx
2018-12-08 20:11:09 +02:00
Tim Möhlmann
94e42c9b52
Merge pull request #727 from usrpro/feat-subnet2
Move the Mailu Docker network to a fixed subnet.
2018-12-08 12:40:45 +02:00
Tim Möhlmann
33c0a99ffc
Merge pull request #678 from hacor/k8s-cni-fix
Added kubernetes CNI support for Mailu
2018-12-08 12:29:25 +02:00
Tim Möhlmann
bb85079d92
Merge pull request #695 from ofthesun9/master-patch1
POD_ADDRESS_RANGE need to be defined for admin service (dovecot authentific…
2018-12-08 12:25:35 +02:00
mergify-bot
491f6b24bb Merge branch 'master' into 'feat-subnet2' 2018-12-08 00:46:17 +01:00
Dario Ernst
1aa97c9914 Add certificate watcher for external certs to reload nginx
In case of TLS_FLAVOR=[mail,cert], the user supplies their own certificates.
However, since nginx is not aware of changes to these files, it cannot
reload itself e.g. when the certs get renewed.

To solve this, let’s add a small daemon in the place of
`letsencrypt.py`, which uses a flexible file-watching framework and
reloads nginx in the case the certificates change ….
2018-12-07 16:20:42 +00: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
97d338e68a
Rectify 'endif' placement 2018-12-07 16:44:42 +02:00
Tim Möhlmann
7f46876b0c
Merge pull request #731 from usrpro/attachment-size
Dynamic attachment size limit
2018-12-07 16:38:34 +02:00
Tim Möhlmann
425cdd5e77
Fix syntax errors 2018-12-07 16:29:41 +02:00
Tim Möhlmann
20f1faf6d0
Send 404 when nothing server at '/'
Prevents Nginx welcome screen
2018-12-07 16:10:52 +02:00
Tim Möhlmann
c25ba75d68
Include WEBROOT_REDIRECT in setup templates 2018-12-07 15:29:33 +02:00
Tim Möhlmann
9208d7262f
Correct variable naming in .env 2018-12-07 15:22:01 +02:00
Tim Möhlmann
2de4995fec
Don't redirect when webmail is served on '/' 2018-12-07 15:17:04 +02:00
Tim Möhlmann
28daa22842
Merge pull request #726 from usrpro/update-mergify
review/need2 in mergify
2018-12-07 13:48:15 +02:00
Tim Möhlmann
8e5ccf2754
Don't merge when WIP or Blocked 2018-12-07 13:47:22 +02:00
Tim Möhlmann
626559f99b
Mergify dismiss reviews 2018-12-07 13:43:53 +02:00
Ionut Filip
94edb48f08 Dynamic attachment size 2018-12-07 13:37:40 +02:00
Tim Möhlmann
a2a9512afa
Enable mergify strict mode
In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)

Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.

More info: https://doc.mergify.io/strict-workflow.html
2018-12-07 11:53:43 +02:00
Tim Möhlmann
f0906073e3
Merge remote-tracking branch 'upstream/master' into feat-subnet2 2018-12-07 11:08:28 +02:00