Commit Graph

740 Commits (d215bf1e5bed21a193b80caaff646fabe18a51bf)

Author SHA1 Message Date
andryyy d215bf1e5b Drop view and table 2017-05-17 21:54:53 +02:00
André Peters fa9a058cf8 Merge pull request #287 from mailcow/dev
Dev
2017-05-17 21:20:19 +02:00
André Peters a72631fb15 Merge branch 'master' into dev 2017-05-17 21:20:12 +02:00
andryyy c9184a9bad Various fixes and changes 2017-05-17 21:17:00 +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
André Peters 73920fbbc0 Merge pull request #280 from Dennis14e/patch-2
Fix session bug, formatting, update bootstrap/bootswatch
2017-05-16 20:11:25 +02:00
Dennis Neufeld 0d3d9b8c15 Fix bug: Session cookie domain
If the web domain is != mail domain, the session cookie is set to the wrong domain.
2017-05-16 19:46:24 +02:00
Dennis Neufeld 53d02ded2a Add missing question mark (GET-URL) 2017-05-16 19:25:35 +02:00
Dennis Neufeld b2a5bf0453 Formatting, Updated Bootstrap/Bootswatch 2017-05-16 19:20:58 +02:00
André Peters a634774bb8 Merge pull request #279 from Dennis14e/patch-1
Updates language files, better language selection
2017-05-16 18:27:56 +02:00
Dennis Neufeld 9f4491b9be Language selection: Fix missing negation 2017-05-16 18:17:31 +02:00
Dennis Neufeld 8fb6a4c34d Language selection
Better way to select language
2017-05-16 18:11:58 +02:00
Dennis Neufeld 4a9c9c220a Updated languages
Use HTML5-linebreak instead of XHTML
2017-05-16 18:11:00 +02:00
andryyy cab5277ce5 Check if variable is not empty to prevent warnings 2017-05-16 11:59:20 +02:00
andryyy 08ad62a253 Fix domain actions 2017-05-16 09:51:05 +02:00
andryyy 4007db0862 Fix domain actions 2017-05-16 09:50:15 +02:00
andryyy e91c6916ab CSRF protection 2017-05-15 11:37:12 +02:00
andryyy 4c6cfa66a8 CSRF protection 2017-05-15 11:36:31 +02:00
andryyy 88b0f84f3c Minor change 2017-05-15 09:30:33 +02:00
andryyy 82c805d091 Remove owasp tool 2017-05-15 09:29:03 +02:00
andryyy fccdabb113 Remove owasp csrf tool 2017-05-15 09:00:37 +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 d06e938d0e Destroy session when invalid, use more compatible js path 2017-05-14 21:54:18 +02:00
andryyy 49f28ecaf8 Destroy session when it becomes invalid 2017-05-14 21:53:08 +02:00
andryyy e795898b80 Fix Redis migration 2017-05-14 20:16:43 +02:00
andryyy 3ab77b1303 Skip domain in config 2017-05-14 20:15:59 +02:00
andryyy 1add37157d Remove icu lib dev 2017-05-14 20:15:34 +02:00
andryyy c92434af61 Fix ipv6 2017-05-14 20:10:32 +02:00
andryyy ce4c5b80b8 Fix migration to Redis 2017-05-14 20:07:43 +02:00
André Peters ce29cf3220 Merge pull request #273 from mkuron/patch-1
ipv6nat: automatically load kernel modules if needed
2017-05-14 19:09:55 +02:00
Michael Kuron e6b6ca7f2d ipv6nat: automatically load kernel modules if needed 2017-05-14 17:56:23 +02:00
andryyy a46a84a949 Fix docker-entrypoint, fixes key merging from file to Redis 2017-05-14 14:26:07 +02:00
andryyy 0ea977b1a0 Fix path 2017-05-14 14:25:21 +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
André Peters a5da2f759f Merge pull request #269 from mailcow/dev
Disable error all
2017-05-13 23:08:32 +02:00
andryyy ed1679baef Disable error all 2017-05-13 23:07:48 +02:00
André Peters 0cfd0b55bd Merge pull request #268 from mailcow/dev
Dev
2017-05-13 23:06:19 +02:00
andryyy 2291b4e121 Added SOGo logs 2017-05-13 22:58:29 +02:00
andryyy 980acb507e Log to redis and file 2017-05-13 22:58:10 +02:00
André Peters 5e537825e8 Merge pull request #267 from michael-k/dockerfiles
Follow best practices in Dockerfiles
2017-05-13 21:50:31 +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