Commit Graph

2349 Commits

Author SHA1 Message Date
André Peters
364338408b
Delete api.php 2017-10-31 11:10:27 +01:00
André Peters
8f24b8c646
Merge pull request #705 from mailcow/revert-703-master
Revert "Adding a primary key in domain_admins table"
2017-10-31 10:43:55 +01:00
André Peters
c8be2240e4
Revert "Adding a primary key in domain_admins table" 2017-10-31 10:43:45 +01:00
André Peters
5f7fc38fd8
Merge pull request #703 from MAGICCC/master
Adding a primary key in domain_admins table
2017-10-31 10:41:09 +01:00
MAGIC
07995c02c4
Adding a primary key in domain_admins table 2017-10-30 23:21:29 +01:00
André Peters
f7e3626e67
Merge pull request #701 from markusg/master
Rspamd History fix small error
2017-10-30 22:30:24 +01:00
markusg
d107dcd7d1 Rspamd History fix small error 2017-10-30 22:15:11 +01:00
André Peters
be752828d1
Merge pull request #700 from mkuron/compose21
docker-compose file format version 2.1
2017-10-30 19:01:38 +01:00
Michael Kuron
7dc0167f3d
docker-compose file format version 2.1 2017-10-30 15:25:06 +01:00
André
eb6f0ebd81 Merge branch 'dev' 2017-10-27 11:24:29 +02: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é Peters
255d4be785 Update docker-compose.yml 2017-10-27 09:57:23 +02:00
André
fe2bd9779b Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-10-26 22:25:28 +02:00
André
083174a9bd [Rspamd] Do not try to index nil value 2017-10-26 22:25:13 +02:00
André Peters
01f3c1fac6 Merge pull request #674 from asirinelli/french
French translation
2017-10-26 22:24:40 +02:00
Antoine Sirinelli
8034c196b1 Enable French language. 2017-10-26 22:00:12 +02:00
Antoine Sirinelli
69b1b183e8 Add French translation 2017-10-26 21:59:41 +02:00
André
e5e2990cda [Rspamd] Do not try to index nil value 2017-10-26 12:51:30 +02:00
André
b80771240e Update Travis 2017-10-26 10:58:24 +02:00
André
508b712ae1 [Web] Revert user acl 2017-10-26 10:35:03 +02:00
André
4156b4cdf8 [Rspamd] Disable spoofed sender check 2017-10-26 10:29:13 +02:00
André
819124c86e Remove helper script 2017-10-26 10:23:38 +02:00
André
25ee53289b Fix metrics 2017-10-26 10:22:16 +02:00
André
db5a3ae47f [Web] Start work on ACL; [Helper] Nextcloud helper script 2017-10-26 10:21:12 +02:00
André
988978b351 [Rspamd] Remove log helper and disable fann redis 2017-10-25 20:55:11 +02:00
André Peters
003fe9d81f Merge pull request #682 from mkuron/rspamd-update-1
Update rspamd
2017-10-25 20:19:37 +02:00
Michael Kuron
3692fc8f32 Update rspamd 2017-10-25 19:43:44 +02:00
André
4fd5b9afba [SOGo] Fix for some Outlook 2016 EAS problems 2017-10-25 08:57:34 +02:00
Antoine Sirinelli
4797057a07 Remove the duplicate string definitions (english)
The following strings were defined twice in lang.en.php.
The first occurence has been removed to avoid confusion (and bugs from
translation tools):

- $lang['danger']['whitelist_from_invalid']
- $lang['success']['aliasd_modified']
- $lang['user']['spamfilter_default_score']
- $lang['edit']['save']
- $lang['tfa']['totp']
- $lang['admin']['sr']
- $lang['admin']['save']
2017-10-23 22:45:51 +02:00
André
04cb033f0a [PHP-FPM] Add imagemagic 2017-10-21 10:10:27 +02:00
André
f7cd7cc123 [Rspamd] Redis history is enabled by default 2017-10-21 10:09:53 +02:00
André
7054aa316b [Compose] New Rspamd image version; Syntax check Nginx conf before starting container; New ACME image version 2017-10-21 10:09:29 +02:00
André
a110e2ea0f [ACME] Fix detection of orphaned SANs and add tini 2017-10-21 10:08:20 +02:00
André
81775765d8 [Web] Customize app menu and logo; Fix #671 2017-10-21 10:07:06 +02:00
André
a35bf76154 [Compose] Remove init where possible or replace init by tini, set grace periods 2017-10-15 09:42:51 +02:00
André
6b6470fe54 [Rspamd] Use tini 2017-10-15 09:31:19 +02:00
André
c3e36be576 [Compose] Start to replace init 2017-10-14 23:26:47 +02:00
André
92e8233c92 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-10-14 23:26:14 +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
André Peters
3fd33ce22b Merge pull request #666 from mkuron/greylist
rspamd: fully disable greylisting for forwarding hosts
2017-10-14 18:18:37 +02:00
Michael Kuron
a4ccd780c6 rspamd: disable greylisting for forwarding hosts 2017-10-14 16:40:44 +02:00
André Peters
f75f56aba6 Merge pull request #665 from mkuron/rspamd-update
Update rspamd to fix force_actions issue
2017-10-14 14:41:16 +02:00
Michael Kuron
331cedd12f Update rspamd 2017-10-14 13:18:44 +02:00
André
33b0167bcc [Web] Accept empty values for sync jobs, fixes #663 2017-10-14 08:34:55 +02:00
André
a3e966696f [Nginx] Revert to site splitting 2017-10-12 08:37:48 +02:00
root
27772cfcbc Add gitignore for bak files in nginx conf dir 2017-10-12 08:36:47 +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