Commit Graph

3341 Commits

Author SHA1 Message Date
andryyy
674202012e Solve conflicts
Merge branch 'master' into dev

Conflicts:
	data/conf/bind9/named.conf
	data/web/modals/footer.php
	docker-compose.yml
2017-06-21 19:28:28 +02:00
andryyy
51011732c7 Slight changes 2017-06-21 16:53:36 +02:00
andryyy
2c8a5ce3f8 Update update.sh 2017-06-21 16:44:57 +02:00
andryyy
e9b2c2845e Ignore untracked conf files for Rspamd 2017-06-21 16:23:16 +02:00
andryyy
c3bab9c6a6 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-06-21 12:40:50 +02:00
andryyy
4503a76a28 Add more info to update script 2017-06-21 12:40:42 +02:00
André Peters
ac28e5862b Merge pull request #377 from NuVivo314/dev
[imapsync] Change Select Order
2017-06-21 12:13:58 +02:00
andryyy
0f023cffed Update update.sh 2017-06-21 12:10:20 +02:00
andryyy
959f4a428f Update update.sh 2017-06-21 11:57:32 +02:00
NuVivo314
601f3b6947 Change select Priority
Simple change, for Select Older
2017-06-21 11:54:03 +02:00
andryyy
306373558e Fix update script 2017-06-21 11:48:03 +02:00
andryyy
a45d78db54 Fix update script 2017-06-21 11:46:53 +02:00
andryyy
a0589b4275 Fix update script, fix gitignore 2017-06-21 11:46:01 +02:00
andryyy
b26ee88269 Exit after error 2017-06-21 11:07:20 +02:00
andryyy
a782cee8a1 Add gitignore, fix script 2017-06-21 11:05:59 +02:00
andryyy
578011c78c Move milter config, increase timeout for DNS 2017-06-21 10:18:52 +02:00
andryyy
c40875e8ca Fix auto update 2017-06-20 23:43:19 +02:00
andryyy
da2cdb686f Auto update script 2017-06-20 23:41:25 +02:00
andryyy
044c928ba1 Clean up dangling docker objects after updates 2017-06-20 23:22:39 +02:00
andryyy
eaf15d25b6 Don't need to backup images with tags 2017-06-20 23:05:43 +02:00
andryyy
cbc4e31b4e Further changes to update.sh 2017-06-20 22:17:41 +02:00
andryyy
1095ba3066 Fix ssl in update.sh 2017-06-20 21:40:15 +02:00
andryyy
ce095432e9 Add fail2ban, run pull after update 2017-06-20 21:21:21 +02:00
andryyy
aa89603dc4 Use currently active branch 2017-06-20 20:42:11 +02:00
andryyy
05fc733091 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-06-20 20:07:30 +02:00
andryyy
c82c9524b0 Delete certificate if SANs were removed 2017-06-20 20:06:54 +02:00
andryyy
428140d34f Version update 2017-06-20 20:06:35 +02:00
andryyy
0e501acd7d Base on stretch 2017-06-20 20:06:24 +02:00
andryyy
ca917673bd Introduce image tags 2017-06-20 20:05:49 +02:00
André Peters
f782062dbd Merge pull request #375 from mkuron/tb
Make Thunderbird plugin download more resilient
2017-06-20 09:39:05 +02:00
andryyy
d5eb85ea6b Added notes 2017-06-20 00:03:09 +02:00
andryyy
71207b05fe Update update.sh 2017-06-20 00:02:03 +02:00
andryyy
a9fc66b956 Add update.sh, a wip 2017-06-19 23:31:43 +02:00
Michael Kuron
987d83e104 Make Thunderbird plugin download more resilient
- use specific GitHub API version
- use only-matching grep
- remove hard-coded version number
- use Mozilla Addons API
2017-06-19 20:48:56 +02:00
André Peters
beac3035f6 Merge pull request #372 from lazyfrosch/sync-password
data/web: Update syncjob password input to type password
2017-06-19 17:12:49 +02:00
André Peters
7cd1b3dc10 Merge pull request #373 from lazyfrosch/imapsync-password
dovecot/imapsync_cron: Use passfiles to hide passwords from ps
2017-06-19 17:12:36 +02:00
Markus Frosch
4be67ccd64 dovecot/imapsync_cron: Use passfiles to hide passwords from ps 2017-06-19 11:43:07 +02:00
Markus Frosch
0f8bf53d9c data/web: Update syncjob password input to type password
So the password is not readable in clear text.
2017-06-19 11:22:19 +02:00
andryyy
036c51f053 Prefere ipv4 to fix problems on v4-only envs 2017-06-19 10:39:14 +02:00
andryyy
68d455e154 Just start reconf-sogo to also trigger SOGos restart after a successful reconfiguration 2017-06-19 10:30:11 +02:00
andryyy
fbf33e475a SOGo will be started after reconf script to prevent race conditions 2017-06-19 10:19:16 +02:00
andryyy
624e52e198 mysqladmin uses ping on static IPv4, supervisor does no more autostart SOGo 2017-06-19 10:18:53 +02:00
andryyy
8eeae43824 Fixed IP for MySQL to prevent IPv6 issues 2017-06-19 10:18:16 +02:00
andryyy
5efe0b9a88 Ignore tar.gz 2017-06-19 10:17:37 +02:00
andryyy
10d83017e1 Declare correct arrays 2017-06-19 08:59:47 +02:00
André Peters
2d59e61c6b Merge pull request #370 from mkuron/patch-2
Autodiscovery for eM Client and Outlook 2007/2010
2017-06-19 08:54:59 +02:00
andryyy
d720f31684 Use unbound.conf from data/conf 2017-06-18 21:03:57 +02:00
andryyy
2a845a0d21 Less verbose 2017-06-18 20:57:54 +02:00
andryyy
9117c499ef Do not break DNS replies.... 2017-06-18 20:57:26 +02:00
andryyy
6fa19a37d8 Unbound changes 2017-06-18 20:23:26 +02:00