Kristian Klausen
63002cbb74
[Nginx] Reduce config duplication
...
It does not make sense having a seperate server block for both http
and https.
According to the nginx doc [1], using the same server block for both
should work.
[1] http://nginx.org/en/docs/http/configuring_https_servers.html#single_http_https_server
2018-02-15 21:23:07 +01:00
André Peters
0bfd0838c2
[SOGo] Increase workers again
2018-02-14 11:26:55 +01:00
André Peters
e186e350ef
[Nginx] Fixes #1033
2018-02-14 09:09:17 +01:00
André Peters
993c998716
Merge pull request #995 from Alireza2n/master
...
SOGO & Rspamd interface: adding "expire" header to static files, allowing browser to be able to cache them
2018-02-14 07:50:22 +01:00
Phoenix Eve Aspacio
42868b1710
Merge pull request #1037 from klausenbusk/empty
...
Remove "empty" folders
2018-02-14 08:15:13 +08:00
Kristian Klausen
a0cdc1e4ff
Remove "empty" folders
...
There seems to be no reason for this empty folders.
2018-02-13 23:45:49 +01:00
André Peters
943598f705
[Nginx] Fix EAS...
2018-02-13 09:12:54 +01:00
André Peters
fb92619aac
[Nginx] Fix EAS...
2018-02-13 09:12:21 +01:00
André Peters
458dfc8418
[Nginx] Remove unused file
2018-02-13 09:11:13 +01:00
André Peters
406e7ebd07
[Nginx] Fix EAS
2018-02-13 09:10:41 +01:00
André Peters
21e8edae43
[Nginx] Fix EAS
2018-02-13 09:09:41 +01:00
André Peters
63f7e5930d
[Nginx] Fix EAS
2018-02-13 09:07:44 +01:00
André Peters
6ad9fbe436
[Compose] Add missing var
2018-02-12 21:37:18 +01:00
André Peters
a3d9f5a984
[Compose] Add missing var
2018-02-12 21:36:55 +01:00
André Peters
bcfd181ac3
[Compose] Add missing var
2018-02-12 21:36:10 +01:00
André Peters
e85cd38945
[SOGo] SOGo refuses to bind to IPv6, so force IPv4 in proxy_pass, fixes #1006
2018-02-12 21:34:59 +01:00
André Peters
74c804b9a3
[SOGo] SOGo refuses to bind to IPv6, so force IPv4 in proxy_pass, fixes #1006
2018-02-12 21:32:49 +01:00
André Peters
7a69586d91
[Web] Do not break init_db when switching branches
2018-02-11 15:59:58 +01:00
André Peters
5030ce7547
[Web] More and more fixes for #1017
2018-02-11 15:59:35 +01:00
André Peters
52449afdc0
[Web] Fixes to Sieve validation ( fixes #1027 )
2018-02-11 13:29:13 +01:00
André Peters
c529de9c36
[Web] Fixes to Sieve validation ( fixes #1027 )
2018-02-11 13:28:40 +01:00
André Peters
618be3bf14
[Web] Even more fixes for #1017
2018-02-10 22:42:46 +01:00
André Peters
8e1ac0bfbb
[Web] More fixes for #1017
2018-02-10 21:00:00 +01:00
André Peters
56350a6bdb
Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev
2018-02-10 18:52:13 +01:00
André Peters
6077d11334
Merge pull request #1022 from MAGICCC/dev
...
Update update.sh
2018-02-10 18:27:51 +01:00
Peter
6db217d97e
Update update.sh
...
Should be `elif` instead of `if`
2018-02-10 18:26:20 +01:00
André Peters
4163f08009
[Web] Fixes #1017
2018-02-10 18:16:01 +01:00
Phoenix Eve Aspacio
78870995d0
Merge pull request #1015 from descala/dev
...
Remove unused language keys from data/web/lang/lang.*.php
2018-02-10 14:35:13 +08:00
André Peters
550888cfb4
[Web] Fixes #1013 by encoding display name in XML request
2018-02-09 23:03:08 +01:00
André Peters
64dbd54478
[Web] Fix urlencoded objects in api
2018-02-09 22:45:04 +01:00
David Escala
8ae5077775
Remove unused language keys from data/web/lang/lang.*.php
...
helper-scripts/check_translations.rb checks if keys present in the master
translation file are used in any php or js code. Writes a sed comand to
stdout to remove unused keys from all lang files.
This saves unnecessary work when translating.
2018-02-09 18:56:06 +01:00
André Peters
07a05b9363
[Rspamd] Enable more modules
2018-02-09 10:32:42 +01:00
André Peters
66a3df16ed
[Netfilter] Fixes empty f2b options
2018-02-09 10:32:12 +01:00
André Peters
e5031accbb
[Nginx] Remove auto-redirect to not break rp
2018-02-09 09:59:35 +01:00
André Peters
3a1e7b4ee1
[Nginx] Pass args when redirecting to https
2018-02-09 09:11:59 +01:00
André Peters
3e9ad820bf
Make sure workercontrollerpassword exists
2018-02-08 23:53:06 +01:00
André Peters
7714cbc7c6
Remove unused ignore
2018-02-08 23:17:50 +01:00
André Peters
1f98c42d4f
[Compose] New images; mount Rspamd sockets; mount override.d as rw
2018-02-08 22:58:27 +01:00
André Peters
83094a773e
[Watchdog] Use socket to pipe to Rspamd
2018-02-08 22:57:29 +01:00
André Peters
004d262e41
[Rspamd] Create missing password include as placeholder
2018-02-08 22:57:17 +01:00
André Peters
ac4982d706
[Dovecot] Use socket to pipe to Rspamd
2018-02-08 22:56:43 +01:00
André Peters
77c7c1fe07
[Web] Fix css; Use socket for Rspamd history; Fix function file name
2018-02-08 22:56:12 +01:00
André Peters
557fa4385c
[Rspamd] Also listen on socket for internal communication
2018-02-08 22:55:34 +01:00
André Peters
a2ca550aa0
[Dovecot] Use socket instead of worker IP
2018-02-08 22:29:43 +01:00
André Peters
e3854a8037
[Dockerapi] Fixes recent chang in exec_run return
2018-02-08 22:29:06 +01:00
André Peters
a50036477e
[Web] Mind was set to french, reverting to english
2018-02-08 20:13:36 +01:00
root
fae542534d
Merge remote-tracking branch 'origin/master' into dev
2018-02-08 19:54:14 +01:00
André Peters
ad0325722b
Merge pull request #1012 from jhesketh/imapsync
...
Fix imapsync for large mailboxes
2018-02-08 11:50:18 +01:00
André Peters
1226eecfa1
Update init_db.inc.php
2018-02-08 11:49:52 +01:00
Joshua Hesketh
2fc13bdfbe
Fix imapsync for large mailboxes
...
Where there is a lot of folders in a mailbox the output may be larger
than TEXT will allow (64KiB). Instead use MEDIUMTEXT (16MiB) which
should be ample.
Additionally check that a sync isn't already running before starting
a new one.
Fixes : #1011
2018-02-08 15:24:04 +11:00