Commit Graph

480 Commits

Author SHA1 Message Date
André Peters
111f65333c Merge pull request #290 from mailcow/dev
Dev
2017-05-18 10:18:53 +02:00
andryyy
eb0920366c Remove defect domain administrators 2017-05-18 10:18:13 +02:00
andryyy
69e72fb271 License 2017-05-18 09:48:22 +02:00
andryyy
90f6d53418 License 2017-05-18 09:47:38 +02:00
André Peters
03b20a4570 Create LICENSE 2017-05-18 09:08:04 +02:00
André Peters
a6642bf0c8 Create LICENSE 2017-05-18 09:07:44 +02:00
andryyy
9965ff10a7 Fix mynetworks: Add mailcow ipv6 network 2017-05-17 22:38:59 +02:00
andryyy
63324b0de8 Fix mynetworks: Add mailcow ipv6 network 2017-05-17 22:38:11 +02:00
andryyy
d215bf1e5b Drop view and table 2017-05-17 21:54:53 +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
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
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
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
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
ed1679baef Disable error all 2017-05-13 23:07:48 +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
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