Commit Graph

2830 Commits

Author SHA1 Message Date
andre.peters
5527d6fb94 [Update] Assume worker-controller-password.inc as unchanged on update 2018-02-01 13:35:18 +01:00
andre.peters
fd849681cc [Compose] Rename fail2ban to netfilter; Add SNAT option; New PHP-FPM image 2018-02-01 13:33:41 +01:00
andre.peters
90fe52cc72 [Update] Use correct subnet for IPv6, allow --ours parameter to merge by gits ours strategy
[Update/config] Allow to set SNAT_TO_SOURCE
2018-02-01 13:32:40 +01:00
andre.peters
875b929405 [Helper] Fail on curl error, add help 2018-02-01 13:30:27 +01:00
andre.peters
5862e4fb03 [Helper] Nextcloud: Use correct IPv6 subnet 2018-02-01 13:29:54 +01:00
andre.peters
b2032c0e8a [Web] Hide up time of containers that are missing
[Web] Rename fail2ban logs to netfiter logs
[Web] Adding timeout to curl requests for dockerapi, fixes #981
[Web] Removed cow from favicon
2018-02-01 13:28:17 +01:00
andre.peters
c7280e182f [Update] Add --ours parameter to override merge strategy 2018-02-01 09:40:08 +01:00
andre.peters
03ad0f22c4 [PHP-FPM] Add bind for upload.ini 2018-01-30 09:00:34 +01:00
andre.peters
81c1ed9e4d [Update] Fix update check 2018-01-30 08:58:59 +01:00
andre.peters
2c5f6bc24b [Compose] New images, disable watchdog debug 2018-01-30 08:58:41 +01:00
André Peters
912ba9b4ff
Fixes #979 2018-01-29 14:42:51 +01:00
André Peters
001d43f993
Update docker-compose.yml 2018-01-29 14:41:09 +01:00
André Peters
4405cb3e74
Merge pull request #953 from mkuron/recipient_map
Expose Postfix's recipient_canonical_maps through web UI
2018-01-28 11:09:22 +01:00
Phoenix Eve Aspacio
ee87d5cb67
Merge pull request #970 from mailcow/quarantaine-to-english
Quarantaine to english
2018-01-28 11:55:09 +08:00
Phoenix Eve Aspacio
28bc4a70ec
Correction 2018-01-28 11:54:32 +08:00
Phoenix Eve Aspacio
afd078d777
Correction 2018-01-28 11:53:48 +08:00
André Peters
bd83b47cea
Merge pull request #966 from mailcow/compose-vars
Add default values for IPV4_NETWORK, IPV6_NETWORK, LOG_LINES to docker-compose.yml
2018-01-27 20:17:31 +01:00
andre.peters
1f08e9a7b7 [Postfix] Fixes #967 (assign correct local network range for mynetworks) 2018-01-27 18:13:35 +01:00
Michael Kuron
8f4b1244a6
[compose] add default values for IPV4_NETWORK, IPV6_NETWORK, LOG_LINES 2018-01-27 17:43:05 +01:00
Michael Kuron
c30448c4d8 Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map
Conflicts:
	data/web/inc/init_db.inc.php
2018-01-27 17:22:08 +01:00
andre.peters
0514a1463d Fix generate_config 2018-01-27 16:52:56 +01:00
andre.peters
f602eb4dbd [Web] Fixes #955 2018-01-27 16:16:22 +01:00
andre.peters
e578397d1c [Helper] Fix acme challenge for Nextcloud sub domain site, remove plain listener 2018-01-27 15:22:16 +01:00
andre.peters
1a97137ee9 [Web] Remove FA js 2018-01-27 12:26:36 +01:00
andre.peters
120f26261d Fix var name.. 2018-01-27 12:24:00 +01:00
andre.peters
78334fe93e [Update] Crit fix for missing vars 2018-01-27 12:19:43 +01:00
andre.peters
8917c1b3bf Merge remote-tracking branch 'origin/dev' 2018-01-27 12:10:27 +01:00
andre.peters
f0bc580ceb [PHP-FPM] Fix port... 2018-01-27 12:09:25 +01:00
André Peters
55586f4cb1
Merge pull request #963 from mailcow/dev
Dev
2018-01-27 10:34:34 +01:00
andre.peters
c33ec7e989 [PHP-FPM] Fix duplicate listen 2018-01-27 10:33:50 +01:00
andre.peters
7433b6dc91 [ClamAV] Build from source, fix bugs...
[Compose] New clamd-mailcow image
2018-01-27 10:26:12 +01:00
andre.peters
8ce9d14e07 [Update] Better update check... 2018-01-26 22:40:00 +01:00
andre.peters
c7729f195b [Rspamd] Fixes #960 2018-01-26 18:56:19 +01:00
andre.peters
b8fc27fc78 [Compose] Add net_bind_service to Postfix container caps 2018-01-25 22:45:06 +01:00
andre.peters
dc024331c7 [Web] Slight css changes; Simple loading overlay... 2018-01-25 13:22:43 +01:00
andre.peters
855e93ef65 [Web] Slight css changes; Simple loading overlay... 2018-01-25 13:22:17 +01:00
andre.peters
04f9d74339 [Web, Dovecot] Add new options to imapsync, other minor changes to forms, partly fixes #955 2018-01-24 12:59:11 +01:00
André Peters
a6ac55e42e
Merge pull request #954 from mailcow/master
Merge master to dev
2018-01-24 09:26:56 +01:00
andre.peters
1c6d3c16b6 [Web] Set Fail2ban subnet sizes 2018-01-24 09:25:28 +01:00
andre.peters
4f2d9bc48e [Compose] New images; Allow to set networks; mount ClamAV configs 2018-01-24 09:25:13 +01:00
andre.peters
1f1ab0960c [Update] Formatting; Added new options 2018-01-24 09:24:40 +01:00
andre.peters
a569fb3435 [Helper] Set Nextcloud trusted proxies by ipv6/4 network vars 2018-01-24 09:19:03 +01:00
andre.peters
1aaa5682b4 [Fail2ban] Allow to set subnet size for banned networks 2018-01-24 09:11:33 +01:00
andre.peters
f2f4dabce4 [Postfix] postconf wrapper for correct config location, fixes #949 2018-01-24 09:10:43 +01:00
andre.peters
46aafff627 [ClamAV] Outsource config 2018-01-24 08:40:13 +01:00
andre.peters
2bf1369453 [Nginx] Set real IP from internal networks 2018-01-24 08:38:03 +01:00
andre.peters
7149350973 [Rspamd] Allow internal IPv6 networks 2018-01-24 08:37:49 +01:00
andre.peters
c9b3044d5d [Postfix] Allow internal IPv6 networks 2018-01-24 08:37:27 +01:00
andre.peters
7efe67daaf [ClamAV] Mount ClamAV config files 2018-01-24 08:36:56 +01:00
andre.peters
696b52b5eb [Unbound] Allow internal networks in access-control 2018-01-24 08:36:37 +01:00