Commit Graph

708 Commits (88b0f84f3c950a5fd280edca576a022c8da7bdcc)

Author SHA1 Message Date
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 861ade77ab New Dockerfile 2017-05-14 22:11:12 +02:00
andryyy d06e938d0e Destroy session when invalid, use more compatible js path 2017-05-14 21:54:18 +02:00
andryyy e795898b80 Fix Redis migration 2017-05-14 20:16: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
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
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
andryyy 0a90bdc4df Fixes #264 2017-05-13 09:42:17 +02:00
André Peters 0950985894 Merge pull request #203 from mkuron/patch-2
IPv6 support
2017-05-13 09:10:32 +02:00
André Peters 42445bee52 Merge pull request #265 from michael-k/indentation
Used tabs for indentation in Dockerfiles
2017-05-13 09:04:46 +02:00
andryyy 66634b19fd Use more alpine images, thanks to K2rool 2017-05-13 09:04:10 +02:00
andryyy 15853df84c JS changes and fixes 2017-05-13 08:55:34 +02:00
Michael Käufl 6cd97c46c5 Used tabs for indentation in Dockerfiles 2017-05-12 20:59:27 +02:00
andryyy b1d0776ad1 Fix selection in filter field 2017-05-11 23:18:57 +02:00
andryyy a478c50681 Change to tabstops 2017-05-11 23:15:06 +02:00
andryyy 14a9a1c616 A lot of changes... still not finished, use with caution.
Edit actions can be done with the internal API, trying to get rid of edit and add files
2017-05-11 23:10:32 +02:00
andryyy f582f0f01b Various fixes, update u2flib 2017-05-09 23:25:23 +02:00
andryyy 4cb8596ff0 Remove unused and unnamed volume 2017-05-09 23:25:13 +02:00
andryyy a8e550244e Remove DKIM keys with api 2017-05-09 21:30:08 +02:00
andryyy 93046dea45 Fixes #261 2017-05-09 21:29:51 +02:00
andryyy 4099b6e25d Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev 2017-05-09 13:44:03 +02:00
andryyy bbff045d04 Use API for forwarding hosts 2017-05-09 13:43:54 +02:00
André Peters 6ebcac5bcb Merge pull request #259 from mkuron/patch-1
Consistent symbol names for forwarding hosts
2017-05-09 11:55:52 +02:00
Michael Kuron 759f21ac6b Consistent symbol names for forwarding hosts
multimap.conf and force_actions weren't using the same name
2017-05-09 07:29:43 +02:00
andryyy 74359f6df4 Use Redis for forwarded_hosts, some fixes 2017-05-08 23:09:40 +02:00
andryyy d64ed65575 Add multimap and forced actions for forwarded_hosts, removed from settings 2017-05-08 23:09:21 +02:00
André Peters 5861bec0c3 Merge pull request #256 from mkuron/forwardinghosts
Optionally enable spam filter for forwarding hosts
2017-05-08 19:00:42 +02:00
andryyy 97dc8d9ff8 Fix modal in admin 2017-05-08 15:44:30 +02:00
andryyy f77c40a179 Better log table, some MySQL to Redis migrations, API changes, other minor changes... 2017-05-08 15:41:05 +02:00
andryyy 2e6fdba2b6 PHP should depend on Redis 2017-05-08 15:40:31 +02:00
andryyy cdf7c87e20 Deleted two http maps, replaced by redis multimaps, much better tag system 2017-05-08 15:39:33 +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
Michael Kuron 7931b00fa0 Fix column width 2017-05-08 07:46:36 +02:00
Michael Kuron 519be0d9f8 Merge branch 'forwardinghosts' of github.com:mkuron/mailcow-dockerized into forwardinghosts 2017-05-08 07:39:51 +02:00