1426 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kaiyou	4060ac2223	Remove some forgotten debugging	2018-12-13 15:19:34 +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
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]	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
mergify[bot]	a634c7b72d	Merge pull request #725 from usrpro/fix-outlook2019-smtp ... Add login method to smtp_auth under ssl	2018-12-06 16:02:35 +00:00
Tim Möhlmann	38eb266c25	Merge pull request #728 from usrpro/fix-autobuild ... Fix autobuild	2018-12-06 17:41:43 +02:00
Tim Möhlmann	c0972face6	Correct subnetting functionality for the tests and setup	2018-12-06 16:44:12 +02:00
Ionut Filip	35be1710a6	Changed user creation command	2018-12-06 12:36:56 +02:00
Ionut Filip	8acf9451fa	Changed admin and user creation command	2018-12-06 12:34:56 +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
kaiyou	3d98124bcd	Merge pull request #670 from kaiyou/refactor-config ... Refactor the admin architecture and configuration management	2018-12-06 10:56:42 +01:00
Tim Möhlmann	fee52e87ed	Don't allow for 1 review when review/need2 label is set	2018-12-06 11:34:28 +02:00
kaiyou	b6aaf57be1	Merge branch 'refactor-config' of github.com:kaiyou/mailu into refactor-config	2018-12-06 10:33:21 +01:00
kaiyou	d0f07984b0	Merge remote-tracking branch 'upstream/master' into refactor-config	2018-12-06 10:23:43 +01:00
kaiyou	07b1e8d765	Merge pull request #722 from usrpro/update-mergify ... Update .mergify.yml	2018-12-06 10:19:07 +01:00
Tim Möhlmann	9dd447e23b	Add login method to smtp_auth under ssl ... Fixes #704	2018-12-06 01:00:16 +02:00
Patrick Georgi	eac4d553a9	nginx: Allow extending config with overrides ... To facilitate this, the default redirect at / can be disabled, even if the default remains at redirecting to the webmailer. The extensions are within the host scope and are read from $ROOT/overrides/nginx/*.conf.	2018-12-05 23:54:52 +01:00
mergify[bot]	c25c646909	Merge pull request #702 from dani909/feat-image-prefix ... Add docker image prefix	2018-12-05 19:24:07 +00:00
hoellen	02367d1447	Merge branch 'master' into feat-image-prefix	2018-12-05 19:48:51 +01:00
mergify[bot]	2d4bac03ad	Merge pull request #723 from usrpro/clean-healthcheck-logs ... Admin: Prevent redirects during health checking	2018-12-05 18:09:14 +00:00
mergify[bot]	a382f74680	Merge pull request #705 from usrpro/fix-recaptcha ... Fix recaptcha	2018-12-05 18:05:22 +00:00
mergify[bot]	ca86090011	Merge pull request #682 from usrpro/feat-setup ... Further improve setup and neccesary re-write of the test suite	2018-12-05 17:57:41 +00:00
mergify[bot]	37027cfce7	Merge pull request #633 from kaiyou/fix-sender-checks ... Improve sender checks	2018-12-05 16:03:24 +00:00
Tim Möhlmann	d18cf7cb25	Prevent redirects during health checking	2018-12-05 17:43:42 +02:00
Tim Möhlmann	d84254ccd8	Update user creation to python3	2018-12-05 16:23:16 +02:00
mergify[bot]	161b27a204	Merge pull request #719 from davidrothera/master ... Query alternative table for domain matches	2018-12-05 12:37:13 +00:00
Tim Möhlmann	b564b879aa	Update .mergify.yml ... - New syntax for mergify engine v. 2 - Relax review rules for trusted users	2018-12-05 12:38:06 +02:00
Tim Möhlmann	c9df311a0d	Set forward_destination to an empty list ... The value of `None` resulted in an error, since a list was expected.	2018-12-04 16:22:18 +02:00