Commit Graph

678 Commits

Author SHA1 Message Date
andre.peters
38a819771b [Netfilter] Rename fail2ban to netfilter, use iptables-python 2018-02-01 13:39:27 +01:00
andre.peters
0773448b35 [Dockerapi] Fix jsonify output 2018-02-01 13:38:42 +01:00
André Peters
912ba9b4ff
Fixes #979 2018-01-29 14:42:51 +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
7433b6dc91 [ClamAV] Build from source, fix bugs...
[Compose] New clamd-mailcow image
2018-01-27 10:26:12 +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
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
Michael Kuron
e86565e283 Expose Postfix's recipient_canonical_maps through web UI 2018-01-23 20:02:31 +01:00
andre.peters
a7a7b3f3fd [Postfix] Use name instead of IP 2018-01-21 15:01:51 +01:00
andre.peters
d24bb16947 [Watchdog] Check PHP-FPM port 9000 and 9001 2018-01-21 15:01:35 +01:00
andre.peters
737c41379f [PHP-FPM] Move opcache config to local config file, define new PECL versions 2018-01-21 15:01:02 +01:00
andre.peters
83a21259f7 [Rspamd] Use names instead of IPs 2018-01-21 15:00:05 +01:00
andre.peters
08c8976a95 [SOGo] Show shared aliases and "allow to send as" addresses as FROM fields in SOGo 2018-01-21 14:58:16 +01:00
andre.peters
8419266678 [Web] Important fixes for quarantaine; other minor changes 2018-01-17 15:23:33 +01:00
andre.peters
09b6c20bad [DockerAPI] Hide stderr from rspamadm output 2018-01-14 18:44:06 +01:00
andre.peters
5d5d36fc60 [Dovecot] Revert to 2.2 to fix various errors 2018-01-14 10:44:06 +01:00
andre.peters
38aaeeb30b [Dovecot] Dovecot 2.3 from git for temp fixes
[ACME] Use -a switch (thanks to jas8522!)
2018-01-14 10:34:06 +01:00
andre.peters
42923698fd [Dovcot] Fixes for v2.3 2018-01-13 22:49:50 +01:00
andre.peters
ceef6d6fd3 [Dovecot] Dovecot 2.3, Pigeonhole 0.5
[Watchdog] Fix Dovecot health check
2018-01-09 11:15:52 +01:00
andre.peters
b7a23a28fd Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2018-01-08 22:01:39 +01:00
andre.peters
1e9cae9084 [Compose] New images with LOG_LINES
[Update] Do not add empty line in each loop
2018-01-08 22:00:54 +01:00
Michael Kuron
cde250a989 Properly wait for MySQL to come up before starting SOGo 2018-01-08 19:56:44 +01:00
andre.peters
db032af698 [ACME] Fix script 2017-12-31 17:17:46 +01:00
andre.peters
8d56534e76 [Postfix] Don't try to authenticate to relayhosts without username, fixes #725 2017-12-25 10:18:49 +01:00
Oratorian
236e4d4a36
See Issue #826
Fixes dockerapi-mailcow_1 | raise TypeError('port must be an integer')

Containers are now restarting.
2017-12-18 16:41:04 +01:00
andre.peters
52f4f850cf [Postfix] Fix missing authentication data for relayhosts when sender domain is alias domain 2017-12-17 17:45:12 +01:00
andre.peters
a771d66889 [Dovecot] Update imapsync 2017-12-17 17:45:05 +01:00
andre.peters
2994b94b6c [Docker API] Remove logs, remove env var for compose project name 2017-12-11 09:43:01 +01:00
andre.peters
6c67b9df82 Replace name by IP, remove unused tables 2017-12-09 22:30:18 +01:00
andre.peters
2519738094 Various changes... 2017-12-09 13:15:24 +01:00
Peter Schiffer
7d6fc8e6b6 [Dockerapi] Auto detect version of docker server
Some older versions of docker need specific version of client api to be able to
communicate. This change allows automatically detect and set version of API to
match server version of API.

Fixes #765
2017-12-01 23:41:37 +01:00
André
ade4b9e7ae [Postfix, Web] Feature: BCC maps 2017-11-19 15:13:43 +01:00
André
5211ab10ed [ACME] Fix license issue 2017-11-16 14:57:17 +01:00
André
c45ea5433f [Rspamd] Base on xenial to fix mime types problems 2017-11-15 12:29:18 +01:00
André
fe845ee56d [Fail2ban] Fix fail2ban container 2017-11-14 19:50:20 +01:00
André
84a7a1a2e7 [Compose] New images, Nginx checks for SOGo before bootstrapping
[PHP-FPM] Some more modules (primarily for Horde)
[Fail2ban] Do not log matches of local and private ips
[Watchdog] Some changes in log system for further processing (wip)
[ACME] Fixes #745
2017-11-14 10:44:22 +01:00
André
60e97503f7 [Web, Dovecot] Show wether a sync job is running, validate min max input attr and validate these values 2017-11-08 11:07:32 +01:00
André
a36a8828c2 [Dovecot] Specify supervisord user 2017-11-05 12:19:18 +01:00
André
1ef10f1358 [PHP-FPM] Include net_sieve, test removal of usr/src/php for size 2017-11-03 20:27:43 +01:00
André
a9f64a3472 [Dockerapi] Return answers in json 2017-11-03 20:26:09 +01:00
André
b32e5adcc5 [Dovecot] sieve_before/after maps in sql, changed dict names 2017-11-03 20:25:38 +01:00
André
1e9bc49f2c [Rspamd] Echo dummy for fowardingshosts map; Use higher map reading interval;
[Dockerapi] Exit on sigterm;
[Watchdog] Wait for dockerapi-mailcow to be online
2017-10-27 11:22:39 +02:00
André
04cb033f0a [PHP-FPM] Add imagemagic 2017-10-21 10:10:27 +02:00
André
a110e2ea0f [ACME] Fix detection of orphaned SANs and add tini 2017-10-21 10:08:20 +02:00
André
6b6470fe54 [Rspamd] Use tini 2017-10-15 09:31:19 +02:00
André
ac413058c1 [Watchdog] Fix kill -0 check, use tini and send kill request to tini instead of parent pid, sleep longer 2017-10-14 23:26:08 +02:00
André
c5dd30b058 [ClamAV] Use tini, check if background procs are running, use pipe to output to stdout 2017-10-14 23:25:29 +02:00
andryyy
c5054ae7ed [Watchdog] Ignore null name in jq
[Nginx] Merge sites
[Scripts] Nextcloud helper script (testing!)
2017-10-11 22:56:22 +02:00
andryyy
7c46d6548b [Dovecot] Ignore watchdog IP in logs, filter by syslog-ng 2017-10-11 11:23:20 +02:00
andryyy
e107cbef5e [Postfix] Fix sending as alias, when alias is in alias domains, cleanup 2017-10-11 11:22:52 +02:00
andryyy
2862b43c81 [Watchdog] Fix watchdog to fit non-exposed PHP 2017-10-09 15:54:54 +02:00
andryyy
6110ac386f [SOGo] Use official nightly; [PHP-FPM] Fix expose=off 2017-10-09 15:45:48 +02:00
andryyy
72995ff98e [PHP-FPM] Include more modules for upcoming features and Nextcloud support, drop ro flag; [Watchdog] Some fixes and changes 2017-10-08 22:47:52 +02:00
andryyy
ef9953898c [ACME, Watchdog, DockerAPI] Use only limited Docker API 2017-10-06 13:32:49 +02:00
andryyy
3ae0b16845 [Web, DockerAPI] Be more like official Docker API 2017-10-06 10:20:40 +02:00
andryyy
fc18d153cd [Compose, DockerAPI, Web, Watchdog] Watchdog may send notification mails (todo: docs), DockerAPI via Flesk for limited access 2017-10-05 23:38:33 +02:00
andryyy
9860d44d04 [Watchdog] Do also log errors to Redis if availble 2017-10-04 23:18:51 +02:00
andryyy
2dc8306b69 [Postfix] Remove old socket 2017-10-04 23:15:26 +02:00
andryyy
82ac5fa063 [SOGo] Remove supervisord API 2017-10-04 13:04:35 +02:00
andryyy
9b4ed6b21c [PHP-FPM] Include Docker api for better SOGo status handling and future changes 2017-10-04 13:04:15 +02:00
andryyy
da987e5b48 [Postfix] Forgot 'not' in filter 2017-10-03 16:54:18 +02:00
andryyy
c59d03fcb3 [Watchdog] Skip when use_watchdog=n 2017-10-03 12:07:48 +02:00
andryyy
68d7fa1504 [Watchdog] Skip when use_watchdog=n 2017-10-03 12:05:38 +02:00
Michael Kuron
752a571607 Merge pull request #638 from mkuron/acme
ACME needs to wait for MySQL to be ready
2017-09-28 12:58:07 +02:00
Michael Kuron
ae79445ec0 ACME needs to wait for MySQL to be ready 2017-09-27 19:48:25 +02:00
andryyy
337c9e350e [Watchdog] Reset diff, new image 2017-09-22 16:40:02 +02:00
andryyy
62524150d2 [ACME] Add timestamps, check if acme account key is valid
[Postfix] Ignore local0
[Watchdog] Add Rspamd checks
2017-09-21 19:30:09 +02:00
andryyy
ab850dc901 [ACME] Detect and fix invalid registration 2017-09-21 09:46:09 +02:00
andryyy
41d2a16571 [Watchdog] Script was not executable 2017-09-20 23:36:04 +02:00
andryyy
f511cb0f63 [Watchdog] More fixes and or changes 2017-09-20 23:24:56 +02:00
andryyy
fd1955edca [Fail2ban] Add variable name 2017-09-20 23:24:39 +02:00
andryyy
b6e84fac3a Sleep instead of stopping containers to prevent restarts 2017-09-20 12:50:50 +02:00
andryyy
df5c79c3f1 Fixes for watchdog! 2017-09-20 12:27:24 +02:00
andryyy
e70d5b9206 Fix watchdog 2017-09-20 11:05:23 +02:00
andryyy
a8fb1d3f4f Add experimental watchdog 2017-09-20 10:56:49 +02:00
andryyy
d0c0cd4992 [Rspamd] Fix user settings... 2017-09-16 23:27:13 +02:00
andryyy
1b974bc8d1 [Compose] New images 2017-09-16 23:05:33 +02:00
andryyy
2b97305f6d [ACME] Sleep, don't exit 2017-09-16 13:17:48 +02:00
andryyy
762f18e913 [Clamd] Use Dockerds own init system 2017-09-14 23:13:24 +02:00
andryyy
eeaa48a729 [PHP-FPM] Use valid user for mysqladmin ping
[SOGo] Use valid user for mysqladmin ping
2017-09-12 20:57:18 +02:00
andryyy
1ffed58956 [ACME] New version, better IPv4 detection 2017-09-11 21:51:17 +02:00
andryyy
ed4e8d301c Fix tabs 2017-09-08 18:41:02 +02:00
andryyy
b8c4093702 [Web] Allow a spam score up to 2000, fixes #556 2017-09-07 20:20:36 +02:00
Tobias
fcd0efc265 Change primary name of SSL certificate
Hostname as primary name for the SSL certificate, all other names will
be added as SAN
2017-09-03 19:41:47 +02:00
andryyy
1f90433429 [Dovecot, Postfix, SOGo] Fix redis log cleanup, fixes #542 2017-09-03 11:57:58 +02:00
andryyy
446907944a [Postfix] Fix missing ltrim 2017-09-01 23:40:23 +02:00
andryyy
008d500f4d [Compose, Dovecot] Fixed missing ltrim 2017-09-01 23:39:51 +02:00
andryyy
7351fcf1e3 [Compose, SOGo] New version, ltrim logs 2017-09-01 23:33:12 +02:00
andryyy
4d7bb26874 [Postfix] Add null rcpt for watchdog 2017-09-01 12:22:29 +02:00
andryyy
08d6b97ffa [Dovecot] New Dovecot and Pigeonhole versions; include delete2 option in imapsync 2017-08-31 10:36:10 +02:00
andryyy
4a0e3a433b [Fail2ban] Remove rule to detect disconnects without authentication 2017-08-30 22:27:33 +02:00
andryyy
b1213c51d7 [Rspamd] Dynamic ratelimit fixed, removed async redis request; Ready to implement per-user ratelimits via UI (tbd) 2017-08-30 21:42:39 +02:00
andryyy
7a2c0f2ee7 [Acme] Skip backup mx domains 2017-08-18 09:57:25 +02:00
André Peters
92eefc1288 Merge pull request #486 from mkuron/patch-1
Disable ClamAV phishing filter
2017-08-02 15:54:16 +02:00
Michael Kuron
dec64eef32 Disable ClamAV phishing filter
ClamAV has a phishing filter built in, but it generates too many false positives. We can disable it without risk because rspamd also checks for phishing itself.
2017-08-02 14:42:53 +02:00
andryyy
2eed7c05a1 [Dovecot] Push version, fix cronjob (fixes #310) 2017-08-01 14:02:00 +02:00
andryyy
c7484434dd [Dovecot] Remove master.pid if not running; Check for active imapsync besides lock file; Reconnect MySQL connection in imapsync_cron.pl 2017-07-31 08:19:02 +02:00
andryyy
33bf9f5c5d [Rspamd] Push image version 1.5, Rspamd 1.6.3 2017-07-26 23:07:01 +02:00
andryyy
8da02378b1 [Rspamd] Use Nginx IP in settings map 2017-07-26 23:04:49 +02:00
andryyy
03c614f749 [Postfix] Use Nginx IP in whitelist_forwardinghosts.sh 2017-07-26 23:04:27 +02:00
andryyy
b629089ff8 [SOGo] Rename reconf-domains to bootstrap-sogo and exec sogod after a successful bootstrap; Wait for SOGo to die and free listener 2017-07-24 23:25:04 +02:00
andryyy
5d5646df0c [Compose, SOGo] Update SOGo, give SOGo more time for a graceful restart, autorestart on any exit code 2017-07-24 22:53:23 +02:00
andryyy
83d485dd94 [Web, Postfix, Compose] Allow to add relayhosts per domain (+ plain and login authentication) 2017-07-22 20:39:54 +02:00
andryyy
ed33cb5f57 [Rspamd] ARC: Disallow login/domain mismatch 2017-07-21 11:03:35 +02:00
andryyy
5f5872f78b [Rspamd] Initial custom ratelimit support 2017-07-13 12:54:53 +02:00
andryyy
e6727b1fd6 [ACME] Iterate alias domains, use hostname in subject field 2017-07-13 12:51:52 +02:00
andryyy
9e92c4a2ad [Dovecot] Do not keep persistent logs in a container 2017-07-11 17:09:31 +02:00
andryyy
f8ae5158cb [Postfix] Do not keep persistent logs in a container 2017-07-11 17:09:20 +02:00
andryyy
a31819fd6c [SOGo] Log to a pipe to not keep logs in a container 2017-07-11 17:08:06 +02:00
andryyy
51660589d4 [Rspamd] Push version 1.3 2017-07-09 22:28:36 +02:00
andryyy
a324b1a385 [Rspamd] Fix DKIM siging (base64 hash line folding) 2017-07-06 15:57:33 +02:00
andryyy
69da02c144 [Dovecot] Important fix for Pigeonhole (downgrade) 2017-07-05 19:13:07 +02:00
andryyy
7f47af1d60 Fix destination hash 2017-07-05 12:31:52 +02:00
andryyy
87cc5f54ff [Postfix] Fix redis log destination hash 2017-07-05 12:03:12 +02:00
andryyy
2fadfee61a [SOGo] Remove thunderbird plugin generation, will move to docs 2017-07-05 10:22:48 +02:00
andryyy
de14d30e6b [ACME] Fix exit command (was using echo), fix for duplicate SAN (filter) 2017-07-04 21:32:58 +02:00
andryyy
dc463c3dda [Multiple] Push multiple logs to Redis channel for fail2ban-mailcow to read. Enables Fail2ban independently of used Docker logging driver. 2017-07-04 18:08:20 +02:00
andryyy
ed11e7586e [Clamd] Add SKIP_CLAMD variable to disable Clamd start 2017-07-04 18:05:44 +02:00
andryyy
ace247b3b9 [ACME] Unset name arrays before reusing them 2017-07-03 10:20:09 +02:00
andryyy
2cf9f71613 [ACME] Revert fix for empty additional_san, fix skip_ip_check in ACME 2017-07-02 20:18:22 +02:00
andryyy
cf902854d7 Merge, conflict fixed 2017-07-02 11:22:35 +02:00
andryyy
b7cb4ac9d5 [Fail2ban] Added more regex to match failed or disallowed logins to Dovecot, changed Mailcow to mailcow 2017-07-02 11:10:35 +02:00
andryyy
ae5ce6568d [Dovecot] Dovecot 2.2.31, Pigeonhole 0.4.19 2017-06-30 20:30:30 +02:00
andryyy
5ab11c0c1e [ACME] Show err instead of empty var when IP lookup failed 2017-06-30 20:29:55 +02:00
andryyy
d2048ccf20 [ACME] Be more verbose about IP address 2017-06-29 21:22:01 +02:00
andryyy
a6b60aebb8 [Fai2ban] Added auto-detection for container names; Allow multiple rules for each container; log rule id and container on match 2017-06-29 11:30:14 +02:00
andryyy
9040d456ed [acme-mailcow] Auto-detect container ids for restart; Restart containers after restore 2017-06-29 10:25:32 +02:00
andryyy
3d652dd3d0 Added more checks for acme-mailcow 2017-06-29 00:56:51 +02:00
andryyy
6d8438c01c - More checks for acme-mailcow (verify hashes)
- Autodiscover configuration file: Merge array from vars.local.inc.php
- Push acme-mailcow to 1.6
2017-06-28 23:22:51 +02:00
andryyy
b0584c3622 Use , as IFS for additional san 2017-06-28 10:50:51 +02:00
andryyy
f7bce8b81a Copy dhparams if not found 2017-06-27 20:15:53 +02:00
andryyy
e9ea0712f2 Add SKIP_FAIL2BAN var 2017-06-27 10:26:48 +02:00
andryyy
b9ffcf2bf8 Add whitelist function to Fail2ban 2017-06-26 23:18:05 +02:00
andryyy
8590cc577b Move folder names to match image names 2017-06-25 00:21:24 +02:00
andryyy
c4c1bdf477 Add a retry window for fail2ban-mailcow, add priority to logging, added window time to logging string" 2017-06-24 20:04:12 +02:00
andryyy
b8e9b3d879 fail2ban:1.1, use Redis, add logging, ban time and max attempts to be configured via UI soon 2017-06-24 00:07:18 +02:00
andryyy
2104034156 cp -n is unknown 2017-06-23 14:22:54 +02:00
andryyy
59623a639e Keep key when issuing new certificate to not break TLSA records with options 3 1 1 2017-06-23 08:40:05 +02:00
andryyy
18e52ab27d More debug output, keep key for TLSA 3 1 1, other minor changes 2017-06-23 08:33:07 +02:00
andryyy
85a9239ae9 Move account key 2017-06-22 21:44:10 +02:00
andryyy
0c07ff59c3 Fix skip le test... 2017-06-22 21:31:14 +02:00
Michael Kuron
1f9b5cb16e ACME: support CNAME in domain checks 2017-06-22 20:36:03 +02:00
andryyy
4066f3507c New Rspamd image, also fixes #386 2017-06-22 17:12:13 +02:00
andryyy
856b05147c Skip LE with configuration parameter 2017-06-22 09:06:24 +02:00
NuVivo314
601f3b6947 Change select Priority
Simple change, for Select Older
2017-06-21 11:54:03 +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
Markus Frosch
4be67ccd64 dovecot/imapsync_cron: Use passfiles to hide passwords from ps 2017-06-19 11:43:07 +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
10d83017e1 Declare correct arrays 2017-06-19 08:59:47 +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
andryyy
5aba885b58 Skip ACME client for other certificates than LE 2017-06-17 10:08:12 +02:00
andryyy
08edc1d1d3 Remove obsolete file, add {} 2017-06-16 23:27:16 +02:00
andryyy
812b9b617a Cannot spawn as proc in sub shell. Breaks SOGo restart. 2017-06-16 23:26:43 +02:00
Michael Kuron
c739091a67 Customize the SOGo Integrator plugin for Thunderbird 2017-06-16 10:30:40 +02:00
andryyy
19325ffb2a Validate additional SAN 2017-06-14 07:24:32 +02:00
andryyy
863a0e4d06 Finally fix SOGo race condition 2017-06-13 23:38:47 +02:00
andryyy
4a0a9cbf1f Minor tweaks 2017-06-13 23:38:24 +02:00
andryyy
0fd0cff8ac Auto-sign autodiscover and autoconfig for all domains found in mailcow - only if A records exists and matches 2017-06-13 23:37:48 +02:00
andryyy
9a99975394 Fix duplicate postfix install 2017-06-13 07:45:24 +02:00
andryyy
3e09d11856 Be less verbose 2017-06-13 07:41:13 +02:00
andryyy
fcfc119805 Fix race condition with workaround 2017-06-13 07:39:45 +02:00
andryyy
35a73025c7 Add until to hopefully stop race condition 2017-06-12 23:49:21 +02:00
andryyy
a33aa7a2cb Fix Dockerfile 2017-06-12 23:48:56 +02:00
andryyy
261e1ad4fb Rspamd stable 2017-06-12 23:48:42 +02:00
andryyy
b367ec0ace Add Unbound as better DNSSEC enabled resolver 2017-06-12 23:48:27 +02:00
Michael Kuron
d6c9f96b4e Don't keep development packages in php-fpm image. 2017-06-12 17:06:57 +02:00
andryyy
ef62f6b383 Acme tool checks for valid autodiscover and autoconfig A records and skips non-existing names
Todo: Add AAAA check, add check for additional_san
2017-06-12 10:45:12 +02:00
andryyy
ad969d15cd Remove bind9 2017-06-12 10:43:36 +02:00
andryyy
a25fc17b87 Fix permission 2017-06-12 10:43:28 +02:00
andryyy
c0619a5b6b Less layers 2017-06-12 10:43:11 +02:00
andryyy
5321ebe707 Push to Dovecot 2.2.30 2017-06-12 10:42:48 +02:00
andryyy
cf44745c18 Less layers 2017-06-12 10:42:33 +02:00
andryyy
02ceb6d3ef Remove obsolete files 2017-06-12 10:40:08 +02:00
andryyy
663ea7815c Use new milter interface 2017-06-06 22:01:41 +02:00
andryyy
f84a3a731a File indents 2017-05-29 21:50:43 +02:00
andryyy
ed58a9a9b3 File permission 2017-05-29 21:49:47 +02:00
André Peters
ae707cd8ff Revert "php-fpm dockerfile simplification" 2017-05-29 08:45:30 +02:00
André Peters
192eb50449 Merge pull request #319 from TBK0000/php-fpm-alpine
php-fpm dockerfile simplification
2017-05-29 07:32:24 +02:00
TBK
9ee00c9933 php-fpm dockerfile simplification
By using Alpine pkgs instead of the official php base image the image size has been reduced from 459 MB to 55.7 MB a reduction of a whooping 403.3 MB :D
2017-05-28 23:33:16 +02:00
TBK
e151e32730 ShellCheck
http://www.shellcheck.net/
2017-05-28 23:28:41 +02:00
TBK
2d0c4db2a5 Clamav dockerfile simplification
- Locked to specific release.
- Fewer layers.
- Size reduction of 49 MB.
2017-05-28 16:23:13 +02:00
andryyy
95c30e8791 Remove change... 2017-05-26 23:03:51 +02:00
andryyy
178a219c05 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-05-26 23:02:34 +02:00
André Peters
4f2a1d940c Merge pull request #313 from mkuron/fail2ban
Authentication rate limiting for Mailcow UI
2017-05-25 15:52:15 +02:00
Michael Kuron
1906c26e5d Auth rate limiting: Mailcow UI and correct treatment of v4-mapped addresses 2017-05-25 13:57:50 +02:00
andryyy
0403579b7e Use hostname 2017-05-25 11:00:14 +02:00
André Peters
8c73b8eb5f Merge pull request #311 from mkuron/fail2ban
Fail2ban-like authentication rate limiting for Postfix, Dovecot and SOGo
2017-05-25 10:58:14 +02:00
Michael Kuron
88f94a2e15 Authentication rate limiting for Postfix, Dovecot and SOGo 2017-05-25 10:44:10 +02:00
andryyy
d1b99d2355 Remove workaround 2017-05-23 22:22:40 +02:00
andryyy
b17543f211 Fixes 2017-05-23 21:50:48 +02:00
andryyy
fd5a59086b More structural changes 2017-05-23 09:36:59 +02:00
André Peters
a72631fb15 Merge branch 'master' into dev 2017-05-17 21:20:12 +02:00
andryyy
a7b854f7ce Fix Dockerfile, again 2017-05-17 21:16:48 +02:00
andryyy
61de3c354c Use Alpine ClamAV 2017-05-17 07:48:48 +02:00
andryyy
dd5b46e9ee Use Alpine PHP-FPM 2017-05-17 07:48:37 +02:00
andryyy
f38d726ed2 Revert base of Rspamd 2017-05-17 07:46:27 +02:00
andryyy
861ade77ab New Dockerfile 2017-05-14 22:11:12 +02:00
andryyy
be044a1592 Add openssl 2017-05-14 22:10:25 +02:00
andryyy
e795898b80 Fix Redis migration 2017-05-14 20:16:43 +02:00
andryyy
1add37157d Remove icu lib dev 2017-05-14 20:15:34 +02:00
andryyy
ce4c5b80b8 Fix migration to Redis 2017-05-14 20:07:43 +02:00
andryyy
a46a84a949 Fix docker-entrypoint, fixes key merging from file to Redis 2017-05-14 14:26:07 +02:00
andryyy
fbac28974b Base on Alpine 2017-05-14 14:25:10 +02:00
andryyy
4b875d1468 Remove some tools after installation 2017-05-14 14:24:55 +02:00
andryyy
cf4cefbccd Base on Alpine, still needs cleanup 2017-05-14 14:23:26 +02:00
andryyy
980acb507e Log to redis and file 2017-05-13 22:58:10 +02:00
Michael Käufl
766a986f27 [Dockerfiles] Do not install both curl and wget
curl is used in rspamd-pipe-*, so I kept curl
2017-05-13 18:10:04 +02:00
Michael Käufl
7fd982f948 [Dockerfiles] Do not persist DEBIAN_FRONTEND=noninteractive in images
According to https://github.com/moby/moby/issues/4032#issuecomment-163689851
(and some other comments in the issue) it's not recommended to set
`DEBIAN_FRONTEND` via `ENV` in a Dockerfile.  `ARG` has the same
effect at build time but does not change `DEBIAN_FRONTEND` in the
final image, so I switched to it.  It should also work to remove it
completely.
2017-05-13 18:10:04 +02:00
Michael Käufl
e081a847a1 [Dockerfiles] Do not keep curl installed 2017-05-13 18:10:04 +02:00
Michael Käufl
559d9dda71 [Dockerfiles] Run rm as early as possible 2017-05-13 18:10:04 +02:00
Michael Käufl
85be7aa973 [Dockerfiles] Sorted list of packages 2017-05-13 18:10:04 +02:00
Michael Käufl
9ab9d76240 [Dockerfiles] Used best practices for apt-get
See https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#apt-get

- Replaced `-y install` with `install -y` (unification)

- Put every package on its own line

- Moved `rm -rf /var/lib/apt/lists/*` in the same `RUN` statement as `apt-get`

- Removed unnecessary `apt-get clean`
  See 03e2923e42/contrib/mkimage/debootstrap (L82-L105)
2017-05-13 18:09:53 +02:00
Michael Käufl
d0d0961006 [Dockerfiles] Replaced deprecated MAINTAINER with LABEL
Used format proposed in
https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
2017-05-13 18:09:45 +02:00
Michael Käufl
6cd97c46c5 Used tabs for indentation in Dockerfiles 2017-05-12 20:59:27 +02:00
andryyy
93046dea45 Fixes #261 2017-05-09 21:29:51 +02:00
andryyy
a18bcce93d Minor style changes 2017-05-08 15:38:03 +02:00
andryyy
653d23a843 Migrate some settings and DKIM keys to Redis when starting 2017-05-08 15:35:24 +02:00
andryyy
a267a4ad71 Use DKIM selector from Redis 2017-05-08 14:11:30 +02:00
andryyy
d614aaf617 Add Json logger 2017-05-06 23:42:18 +02:00
andryyy
a790c2bdc0 Add phpredis 2017-05-05 10:34:31 +02:00
andryyy
3fc42465a0 Fix width problems in mailbox table, change image name to stretch 2017-05-02 09:42:07 +02:00
andryyy
dfee8efa97 Fix DBUSER in entrypoint 2017-04-28 12:24:14 +02:00
andryyy
77992be9fc Update Dovecot and Pigeonhole 2017-04-28 10:53:04 +02:00
andryyy
40f86057e5 Move forwarding host script to Docker image 2017-04-23 19:38:47 +02:00
Michael Kuron
08612f0aef Merge remote-tracking branch 'origin/dev' into forwardinghosts 2017-04-22 18:13:58 +02:00
andryyy
cae7ff7816 Initial clamd container 2017-04-20 21:13:41 +02:00
Michael Kuron
a75d916b74 Forwarding hosts in postscreen 2017-04-17 15:51:50 +02:00
andryyy
06928ec841 imapsync: added option to delete from source after transfer 2017-04-10 13:08:02 +02:00
andryyy
e03136bf21 Add description to command 2017-04-08 23:36:46 +02:00
andryyy
8e3dceb512 Rebase images on stretch 2017-04-05 22:25:59 +02:00
andryyy
5bee39dc95 Use fixed IDs 2017-04-05 22:25:34 +02:00
andryyy
13cd5e0b1d Run sievec after adding keys, use fixed IDs for users 2017-04-05 22:25:16 +02:00
andryyy
2b955d08ab Base on Stretch, add Zeyple 2017-04-05 22:19:41 +02:00
andryyy
58d86dadce Rebase Dovecot on Stretch slim, build from stable source with latest stable Pigeonhole for antispam replacement 2017-04-03 20:06:49 +02:00
andryyy
d5c8f0160c Go back to apt-stable repo 2017-03-26 11:07:50 +02:00
andryyy
42eabf4cb3 Fix Postfix sender when sender is alias in alias domain 2017-03-20 21:38:52 +01:00
andryyy
09850a76e5 Use Rspamds new tag symbol 2017-03-12 14:38:20 +01:00
andryyy
276e370989 Rspamd tag check for non-spam only (post-filter), remove sql files from repository" 2017-03-08 17:58:00 +01:00
andryyy
489b1ff1c0 Fix domain visibility in SOGo (domains should _not_ see each other) 2017-03-08 17:46:21 +01:00
Michael Käufl
a06bac6739 [Dockerfiles] Use COPY instead of ADD 2017-03-07 15:48:24 +01:00
Michael Käufl
9762176810 [Dockerfiles] From -> FROM 2017-03-07 15:48:22 +01:00
andryyy
c283c85d51 Update Postfix and Dovecot, add ignore 2017-03-06 10:33:44 +01:00
andryyy
be8031d8ff Move sleep to docker-compose 2017-03-05 12:25:46 +01:00
andryyy
3e91d06d73 Change maintainer 2017-03-04 15:07:07 +01:00
andryyy
e332579a40 Sleep 30 seconds to wait for Nginx restart 2017-03-04 10:41:36 +01:00
andryyy
c303ef35ae Fix Rspamd 2017-03-04 00:06:58 +01:00
andryyy
714490ad5e Fix Rspamd 2017-03-04 00:02:42 +01:00
andryyy
24f3bf009c Fix Rspamd 2017-03-03 23:45:26 +01:00
andryyy
f6c383431e Fix Rspamd 2017-03-03 23:42:49 +01:00
andryyy
66cbc479d7 Fix Rspamd Dockerfiles 2017-03-03 23:31:32 +01:00
andryyy
614da27c03 Add permission 2017-03-03 22:50:04 +01:00
andryyy
b656fedca6 Rspamd: Wait for maps and settings 2017-03-03 22:26:50 +01:00
andryyy
cad084598d Remove old files, fix tagging 2017-03-03 19:01:33 +01:00
andryyy
83e02cbe4a Init container first 2017-03-03 15:46:43 +01:00
andryyy
0931a153c1 Use local mirrors 2017-03-03 10:54:25 +01:00
andryyy
608cb8ada7 Add config files to Rspamd 2017-02-28 10:01:04 +01:00
andryyy
1668a4e871 Restart SOGo services with delay and not as group 2017-02-23 20:15:27 +01:00
andryyy
1c12799091 Add bind9 and replace pdns 2017-02-23 16:06:28 +01:00
andryyy
3c115c6ea3 Add larger delay between reconf_domains and sogo restart 2017-02-22 19:32:01 +01:00
andryyy
76426b65b2 Not of any use as of today 2017-02-21 22:26:20 +01:00
andryyy
f13df1ec46 Add mraptor to rspamd 2017-02-18 20:29:15 +01:00
andryyy
0ac333bfbf Add Roundcube reqs 2017-02-08 17:21:20 +01:00
andryyy
0a828e8f23 Fix SOGo Dockerfile 2017-02-02 21:12:30 +01:00
andryyy
bd57cd8d0a Remove sender_acl from view to prevent race conditions, use SOGo delegations instead 2017-02-02 21:02:11 +01:00
André Peters
432246b3ca Merge branch 'master' into dev 2017-01-29 22:26:06 +01:00
andryyy
2c04a77e17 Revert change, directory is already created 2017-01-25 19:10:31 +01:00
André Peters
f392a0da81 Merge pull request #20 from psi-4ward/dovecot-volume-fix
Fixed: Dovecot depend on sogo volumes
2017-01-23 23:22:46 +01:00
andryyy
e683faac1b Add libsasl2-modules 2017-01-22 16:42:14 +01:00
andryyy
68d674197d Loop reconf script, add minimal httpd for web resources chrooted 2017-01-21 11:47:51 +01:00
andryyy
b79259875a Wait for SQL before creating view, add kind and multi bookings to view 2017-01-18 21:27:38 +01:00
andryyy
1587c73dad Dovecot imapsync changes 2017-01-15 17:38:54 +01:00
andryyy
89b5d9bde6 Easier container names, allow to set HTTPS port, Typo fix 2017-01-12 21:40:42 +01:00
andryyy
c403933017 Add imapsync tool to Dovecot and change container layout 2017-01-12 20:16:37 +01:00
andryyy
1da550b499 Check Postfix config before spawning Postfix procs 2017-01-12 20:16:01 +01:00
Christoph Wiechert
32f1b672fc Fixed: Dovecot depend on sogo volumes
Volume mount from sogo should be optional
2017-01-11 19:59:46 +01:00
andryyy
75139e51cc Use a single view for all domains - easier but will cause more load with large setups, use procs here instead 2017-01-05 20:35:46 +01:00
andryyy
8503980930 Revert vol change 2017-01-03 10:35:41 +01:00
andryyy
b5e5f8f934 Add volume 2017-01-01 19:49:02 +01:00
andryyy
6d24f582b6 Fixes #4 2016-12-29 21:17:24 +01:00
andryyy
f7b95ae5a0 Restart SOGo from within panel 2016-12-25 10:03:37 +01:00
andryyy
301bd3bc9f Fix rmilter logging 2016-12-23 12:52:36 +01:00
andryyy
29f343c193 Added cron to SOGo, init config on start, added syslog to rmilter 2016-12-23 12:13:21 +01:00
andryyy
5d0081a0ec Base all on xenial to save some space loading chunks, clean-up images 2016-12-23 10:27:48 +01:00
andryyy
b0db732e87 Needs lowercase master user with SHA1 2016-12-23 07:07:50 +01:00
andryyy
de36fe1571 Be more compatible... 2016-12-21 09:38:19 +01:00
andryyy
5aa3ede06e Typo... 2016-12-21 09:34:08 +01:00
andryyy
eef81c58ae Add random created master at each startup to handle SOGo features 2016-12-21 08:25:47 +01:00
andryyy
85b243a15b SOGo multi-domain setup 2016-12-20 15:24:33 +01:00
andryyy
60fca24d1b Create sieve_after handler 2016-12-19 15:19:35 +01:00
andryyy
38e24b5ce3 Back to utf8mb4... 2016-12-19 12:24:39 +01:00
andryyy
1cad07dc5c Back to utf8mb4... 2016-12-19 12:23:56 +01:00
andryyy
8241d576df Base on Ubuntu LTS 16.04 2016-12-18 13:43:00 +01:00
andryyy
d128d46240 New system for SOGo to be able to use cronjobs... mail alarms need bug fix from SOGo 2016-12-18 12:52:32 +01:00
andryyy
cd6ab4b464 Must use MySQL 5.7 for default row format atm, moved volumes etc., some changes to Dockerfiles 2016-12-18 00:10:52 +01:00
andryyy
7ef70e4c81 Move dkim data, vmail and dbs to volumes, changed README 2016-12-17 20:31:59 +01:00
andryyy
70fec52fd4 Write defaults as sogo user 2016-12-17 13:36:59 +01:00
andryyy
9022176ad0 Nginx needs no modification anymore 2016-12-17 10:07:07 +01:00
andryyy
81e8858766 Use gosu 2016-12-17 10:06:49 +01:00
andryyy
8559de7ae6 Fix rspamd settings and dynamic configuration 2016-12-16 08:15:20 +01:00
andryyy
7c9f312f0f Add data containers to fix permission issues 2016-12-15 10:08:06 +01:00
andryyy
d6e0c46b9a Use entrypoint to sed some vars 2016-12-15 10:07:46 +01:00
andryyy
9ce260fbe0 Use entrypoint to sed some vars 2016-12-15 10:07:09 +01:00
andryyy
b6e7c25bee Sigh. 2016-12-14 16:11:49 +01:00
andryyy
9e8a003508 Remove old file 2016-12-14 15:56:30 +01:00
andryyy
2aca3e0d30 Argh. 2016-12-14 15:53:00 +01:00
andryyy
583cf67f86 Change way defaults are written 2016-12-14 14:53:56 +01:00
andryyy
5ce0d0bb6c Fix Dockerfile for SOGo... 2016-12-14 09:52:07 +01:00
andryyy
568d73cf4d Fix SOGo Dockerfile 2016-12-14 09:48:55 +01:00
andryyy
5d410c1a39 Change SOGo Dockerfile 2016-12-14 09:25:54 +01:00
andryyy
0498a8f6be Move Nginx to Docker hub 2016-12-14 09:06:14 +01:00
andryyy
6104cd11ce Move php-fpm to Docker hub 2016-12-14 08:51:43 +01:00
andryyy
1910e3bc29 Fix dovecot for Docker 2016-12-13 20:53:42 +01:00
andryyy
5ec67211d8 Move dovecot 2016-12-13 20:52:57 +01:00
andryyy
36b09f339b Pipe to rspamd 2016-12-13 13:38:45 +01:00
andryyy
7e25826d4e Antispam plugin for Dovecot + rspamd pipe script 2016-12-13 12:26:10 +01:00
andryyy
f76ebfac79 Remove debug optin 2016-12-13 08:01:49 +01:00
andryyy
977a5b4d47 Fix trap for postfix for proper sigterm handling 2016-12-13 07:58:53 +01:00
andryyy
47a5166383 Add pdns resolver, changed some other files 2016-12-11 18:58:29 +01:00
andryyy
e3f0058f4f Changes... 2016-12-11 14:13:17 +01:00
andryyy
42a64b45d7 Fixes, working rspamd settings, generate DKIM keys in PHP 2016-12-10 21:49:41 +01:00
andryyy
5b9e598f6f Add dummy folders for Dockerfiles we pull from hub 2016-12-09 20:47:15 +01:00
andryyy
5f04dc0b04 mailcow dockerized 2016-12-09 20:39:02 +01:00