1
0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-11-24 08:32:50 +02:00
Commit Graph

273 Commits

Author SHA1 Message Date
bl-ue
4aa5718c7d
Fix typos: BusybBox -> BusyBox (#3868) 2020-11-21 22:28:53 +00:00
Lukas Schreiner
d96bf91a0d
Support of different default pass schemes + support of BLF-CRYPT (#3832)
* Introduce MAILCOW_PASS_SCHEME in order to support blowfish (cf. mailcow/mailcow-dockerized#1019)

* Furthermore added dovecot to support new environment varible for MAILCOW_PASS_SCHEME defaulted to SSHA256

* Revert changes regarding gitignore.

* Added fallback to SSHA256 if environment is not proper prepared.

* No fallback within management frontend, as it must match to other components.

* Unified and corrected alignment; implemented support of SSHA512

* Currently, password_hash of PHP is using by default bcrypt (BLF). As this might change later, we must ensure, that BLF is still used after PHP changes its default.

* Switched to BLF-CRYPT by default (even on update)

* Switched to BLF-CRYPT by default (even on update)

* Adding information in config generation / update with link to supported hash algorithm

* Bump sogo version to 1.92

* Fallback to BLF-CRYPT in case password scheme is not proper defined for Mailcow administration.
2020-11-15 20:22:35 +01:00
andryyy
4ddeb317fa
[Update] DOVECOT_MASTER_PASS was not added by update script 2020-10-21 08:42:35 +02:00
andryyy
5f8e13f596 [Dovecot] Allow to define static master user (not recommended) 2020-10-20 15:43:05 +02:00
tunnelpr0
76bd9556c0
[Update] Prevent update.sh from updating docker-compose under Alpine Linux (#3708) 2020-10-18 12:31:01 +02:00
andryyy
f28d9ff7a6
[Update] Show commits on update check 2020-10-09 11:04:42 +02:00
Peter
4234cc027b
[Update] Add new args to update.sh -h output (#3787) 2020-10-02 22:27:26 +02:00
Maxim Baz
05a5f9e84a
Support mailcow.conf being a symlink (#3770)
* Support mailcow.conf being a symlink

* Detect BusyBox sed in update.sh
2020-09-20 22:07:37 +02:00
andryyy
eff907bf90
[Update] IMPORTANT: Remove old and unused bridges overlapping with the new bridge name. Important for older setups running updates 2020-07-15 15:29:09 +02:00
andryyy
a84688e4a1 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2020-05-30 22:39:11 +02:00
andryyy
b30b0fe5a6
[Update] Update with "ours" is not recommended 2020-05-30 22:24:57 +02:00
andryyy
f6a41daffa
[Update] Allow to skip fetching docker-compose 2020-05-29 19:47:44 +02:00
andryyy
7c40943e3f
[Update] Check mulitple IPs 2020-05-16 08:37:07 +02:00
andryyy
066b23bb02
[Config] CIDR API_ALLOW_FROM only allowed via API 2020-05-04 07:50:59 +02:00
andryyy
200167458e
[Config] Allow to disable SOGo (unsupported, experimental) 2020-04-29 10:11:22 +02:00
andryyy
d392257289 [Web] Some changes
[SOGo] Allow to not spawn SOGo but an idling shell
[Rspamd] Remove X-CSA-Complaints from bulk headers...
2020-04-27 20:47:28 +02:00
copyrights
dd833d40c6
fix chmod would fail if needed. (#3482)
Co-authored-by: copyrights <copyrights@mailbox.org>
2020-04-18 22:27:56 +02:00
andryyy
5e5642148c
[Config] Add API_KEY_READ_ONLY 2020-04-11 20:57:35 +02:00
Alexander Holzapfel
1b229412e3
[Update] added --force mode to update skript (#3453) 2020-04-07 13:28:51 +02:00
andryyy
1098f2ec86
[Update] Validate docker-compose stack config before updating 2020-03-22 18:15:07 +01:00
andryyy
33dec1db21
[Update, Config] Add Redis to exposed hosts 2020-03-19 12:19:17 +01:00
andryyy
cbe7d7c578
[Update] Add --skip-start desc 2020-02-25 18:45:44 +01:00
Raoul Bhatia
91090280d0
[Update] Display git diff save message only when local changes exist (#3351) 2020-02-22 11:15:47 +01:00
Raoul Bhatia
3c7b8dc447
[Update] Save git diff only when local changes exist (#3350) 2020-02-22 10:37:30 +01:00
andryyy
838a215f67
[Update] Make sure containers are gone before updating mailcow 2020-02-21 08:52:46 +01:00
andryyy
14c27f13cb
[Update] Add --skip-start switch, implements #3317 2020-02-11 11:25:38 +01:00
andryyy
2c77586c0f
[Update] Add WATCHDOG_EXTERNAL_CHECKS 2020-01-25 20:41:22 +01:00
andryyy
f1aa306ff2
[Watchdog] Add external check for open relay, requires SAL 2020-01-25 18:26:56 +01:00
andryyy
2ffab974da
[Update] Split metrics to actions and groups, warn if metrics is different from repo 2020-01-05 11:22:02 +01:00
andryyy
e775a58df0
[Update] Hide deprecation warning in pip 2020-01-02 20:41:41 +01:00
andryyy
a8a1e779d9
[Update] Update update.sh ... 2019-12-18 21:35:17 +01:00
andryyy
7e2aa42578
[IMPORTANT] If you run Ubuntu 16.04, upgrade your kernel to linux-generic-hwe-16.04
[ClamAV] Remove deprecated parameter
2019-12-05 14:29:04 +01:00
andryyy
4662796c33
[Update] Remove old migration options 2019-10-31 21:25:37 +01:00
Marcel Hofer
f702c67bdc [SSL] add new SNI config on updates / new installs 2019-10-19 13:00:01 +02:00
Zyplonox
79e4a55a3b
Update update.sh 2019-10-16 16:35:11 +02:00
andryyy
3cae2389a0
Ubuntu kernel 4.15.0-60-generic seems to be broken with Docker and --dns flags, do NOT use it! 2019-09-03 22:01:47 +02:00
ntimo
96af23e9a2
[Updater] Save diff files into subdirectory 2019-08-25 16:41:52 +02:00
andryyy
8071544181
[Update] Save diff file 2019-08-09 14:09:30 +02:00
andryyy
1db8317a6b
[Update] Fetch before prefetch 2019-08-04 09:23:19 +02:00
andryyy
5e7466ac7f
[SOGo, Config, Update] Add SOGO_EXPIRE_SESSION to define default session timeout 2019-07-21 13:07:48 +02:00
andryyy
f0e51a39d7
[Update] Exit with fancy error when branch is empty 2019-07-08 18:45:57 +02:00
andryyy
59ca12a7e4
[Update] Prefetch images with --prefetch and quit 2019-07-08 18:42:51 +02:00
MaxXor
831a96551d
Add missing WATCHDOG_NOTIFY_BAN update option 2019-06-15 21:55:23 +02:00
andryyy
8984240e44
[Watchdog, Config] Added WATCHDOG_NOTIFY_BAN to disable IP ban notifications
[Netfilter] Remove unused files after installation
[Compose] Some new images and a new option for watchdog: WATCHDOG_NOTIFY_BAN - defaults to y
2019-06-13 19:38:53 +02:00
andryyy
59e4212702
[Update] Check if file is tracked before running git rm 2019-06-10 22:44:10 +02:00
andryyy
84307e85f2
[Update] Hide error when running git rm on old worker passwd file 2019-06-10 21:44:22 +02:00
andryyy
9c5eda13aa
[Update] Remove controller passwd file from index 2019-06-10 18:37:19 +02:00
MAGIC
f586b0e5a9
[update.sh] Rename enable_ipv6 option 2019-06-02 20:56:08 +02:00
andryyy
ba4ac26ba9
[Update] Increase timeout 2019-05-25 22:37:51 +02:00
andryyy
5b730bf89f
[Update] Prefetch images, big thanks to everyone in #2637! 2019-05-25 22:29:25 +02:00
Javinator9889
e2389f4816
Update update.sh
Updated DNS to Quad9
2019-05-12 14:40:54 +02:00
Javinator9889
a7bd462d74
Update update.sh
*curl* on some systems is failing due to no URL specified (1.1.1.1) and ISP blocking

*curl* needs an URL for working correctly, so sometimes it is failing as it detects **No Internet connection** but there is. In addition, at some countries some ISP did not update their routers and/or network so the Cloudflare DNS `1.1.1.1` are not working either they are blocked. I suggest using `ping` instead of `curl` with a 3 seconds timeout and pinging to Google DNS (8.8.8.8) instead of Cloudflare ones, as they are universally accepted and used.
2019-05-12 10:32:06 +02:00
André Peters
987e884407
Merge branch 'master' into admin-login 2019-03-31 15:49:18 +02:00
andryyy
c612f7ee4c
[Config] Add SKIP_HTTP_VERIFICATION 2019-03-29 07:48:31 +01:00
Marcel Hofer
7d2289c3a7 Merge branch 'master' into admin-login
# Conflicts:
#	data/web/js/site/mailbox.js
2019-03-23 21:17:02 +01:00
andryyy
ca2ac00422
[Update] Fix MAILDIR_SUB 2019-03-18 19:49:05 +01:00
andryyy
22798a85e5
[Config] Add MAILDIR_SUB, "Maildir" for new setups by default
[Update] Add MAILDIR_SUB= for updated mailcows
[Dovecot] Read MAILDIR_SUB for mail_home
2019-03-18 14:09:32 +01:00
André Peters
3d8a46357b
Merge branch 'master' into admin-login 2019-03-18 02:03:59 +01:00
andryyy
d8dbcfac92
[Web] Continue when a check in add_alias fails
[Web] Fix "null" output in mailbox table when comments are missing
[Update] Remove obsolete check/replace command
2019-03-14 01:46:15 +01:00
andryyy
d449984a66 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-03-12 23:39:57 +01:00
andryyy
5b8a983be2
[Update, Config] Set mode 600 for mailcow.conf 2019-03-12 23:23:38 +01:00
André Peters
ae8dfb3449
[Update] Make the update check in update.sh readonly 2019-03-12 17:22:35 +01:00
André Peters
8f6c24e60a
Update update.sh 2019-03-12 17:21:45 +01:00
André Peters
216451ed43
Merge branch 'master' into admin-login 2019-03-10 09:51:12 +01:00
andryyy
3873b7a768
[Update] Add /opt/bin to PATH, fixes #2391 2019-03-02 23:48:26 +01:00
Marcel Hofer
cac67db203 add config ALLOW_ADMIN_EMAIL_LOGIN and implement password-less SOGo login admins 2019-02-23 17:59:18 +01:00
andryyy
7e5fc0f763
[Update] Move Nextcloud Redis fix 2019-01-31 21:55:49 +01:00
andryyy
d9a9716a00 [Update] Move Nextcloud Redis fix 2019-01-31 21:55:13 +01:00
andryyy
40795fd2ab
[Update] Move Nextcloud Redis fix 2019-01-31 21:54:05 +01:00
andryyy
a1baf2112b
[Update] Do not move files before git merge 2019-01-30 23:03:58 +01:00
andryyy
9bd1fcbede
[Config] Add hint to disable Solr if you do not want a readable index in solr-vol-1 2019-01-29 13:29:30 +01:00
andryyy
4245780a66
[Update] Check if run as root 2019-01-29 12:13:04 +01:00
andryyy
aab692301e
[Update] Check internet connection via 1.1.1.1 2019-01-29 00:06:19 +01:00
andryyy
2507a8fd31 [Config] Use #!/usr/bin/env bash for scritps, fixes #2226, thanks to @cptMikky 2019-01-27 19:50:15 +01:00
andryyy
54a14c01aa
[Update] Disable Solr when upgrading from non-Solr mailcows 2019-01-19 22:00:18 +01:00
andryyy
ae4e1358a2
[Solr] Refuse to start with RAM lt 2 GB
[Config/Update] Set limits and change descriptions for Solr
2019-01-17 20:25:38 +01:00
andryyy
d008b67111
[Config] Change some texts, lower RAM req. to 3.5 GB for Solr 2019-01-17 19:44:57 +01:00
André Peters
f3dfe346bf [Dovecot] Allow setting ACL_ANYONE in mailcow.conf 2019-01-16 19:08:19 +01:00
André Peters
31fba0d5e6
Update update.sh 2019-01-16 10:50:06 +01:00
Markus Heberling
9750ec5bec
Merge branch 'master' into master 2019-01-01 14:20:22 +01:00
andryyy
9aca90c75f [SOGo] Fix file path of sogo-full.svg
[Compose] Updated SOGo image
[Update] Add user.name and user.email for local git config if missing
2018-12-22 16:56:50 +01:00
Markus Heberling
4755bb323b Allow setting ACL_ANYONE in the configuration 2018-12-11 11:32:36 +01:00
Fabian Schlenz
adf9daa9b7 Modified the update check in update.sh to fetch the newest revision directly from github without having to run git fetch first. 2018-11-16 12:09:55 +01:00
André Peters
7325d80f19
[Update] Change umask for update to ensure its 0022 2018-10-28 10:41:45 +01:00
andryyy
c9cf3476a0 [Update] Remove obsolete parameters
[Compose] New watchdog image
[Watchdog] Allow multiple rcpts separated by comma
2018-10-26 10:07:23 +02:00
André
93e0206db4 [Update] Remove mailcow_anonymize_headers.pcre checks
[Postfix] Rename mailcow_anonymize_headers.pcre > anonymize_headers.pcre to prevent collisions
2018-10-23 22:57:38 +02:00
André
40888a713a [Update] Checkout pcre header check if missing, fixes #1906 2018-10-16 21:40:25 +02:00
André
03896ccbee [Update] Backup old header check, don't delete 2018-10-16 09:33:23 +02:00
André
2feae48c65 [Update] Remove old header check to prevent update failure 2018-10-16 09:31:37 +02:00
Peter
67adca4e05
Don't print 'Collecting garbage...' twice
When updating mailcow and it finished it printed 'Collecting garbage..,' twice since in docker_garbage() and before running the code we have the echo command.
Now it's printing the line before running docker_garbage()
2018-10-03 12:34:10 +02:00
André
b61f9714e9 [Update] Add MAILDIR_GC_TIME to config file, fixes #1821 2018-10-02 21:24:22 +02:00
André
62b27aeacb [Dovecot] Check garbage hourly
[Dovecot] Update SA rules once when container starts
2018-10-02 09:34:21 +02:00
André
71ec81db31 [Update] Add MAILDIR_GC_TIME 2018-09-30 14:49:19 +02:00
André
ad85033af2 [Update] IMPORTANT: removed SYSCTL_IPV6_DISABLED
[Update] Add help text (-h or --help)
[Update] Run garbage collector with --gc
2018-07-25 01:08:12 +02:00
Florian Braun
2824c44781
Change Umask for update to ensure its 0022
This change sets umask to 0022 and restores it afterwards to the standard umask.
This works around issue
2018-07-13 13:06:56 +02:00
André
b0b18dfc89 [Config] Do not accept non-FQDN as MAILCOW_HOSTNAME
[Config] Add SNAT6_TO_SOURCE
[Update] Do not update on non-FQDN hostname
2018-07-11 19:59:21 +02:00
André
1e59816665 [Netfilter] Prevent crashes by locking threads
[Netfilter] SNAT6
2018-07-11 19:59:10 +02:00
Benjamin Roberts
1602f3b0d0
Fix infinite loop when parsing update.sh arguments
update.sh would enter an infinite loop when arguments (e.g. --ours, --check). This is due to a missing `shift` statement that has now been added. This fixes #1193.
2018-07-04 23:10:30 +10:00
André
6ded3dbd95 [API] Allow to set API options in mailcow.conf, fixes #1457 2018-06-08 09:11:03 +02:00
André
42655e2575 [Update] Do only replace port 9000 if host is phpfpm 2018-04-30 16:35:18 +02:00
André
f0eca3fe7b [Update] Revert Rspamd controller password file change 2018-04-30 08:01:49 +02:00
André
f76294e52a [Update] Move COMPOSE_PROJECT_NAME 2018-04-29 09:27:29 +02:00
André
47e3544035 [Update] Remove parallel option (deprecated), check currently installed docker-compose version, change the way Rspamds controller password is handled 2018-04-29 09:22:00 +02:00
André
73df611339 [Update] Add missing " 2018-04-27 21:24:07 +02:00
André
d897ae71f6 [Update] Fix sed for missing *custom files 2018-04-27 21:23:00 +02:00
André
c0aa3ddf7b [Update] Add COMPOSE_PROJECT_NAME if missing
[Update] Fix NC Redis timeout (if NC is installed via helper script)
2018-04-27 21:00:33 +02:00
André
52f26078e5 [Update] Fix PHP-FPM ports for existing non-mailcow Nginx sites 2018-04-26 13:58:03 +02:00
André
b8feaef629 [Update] Change fetch method, again 2018-04-25 21:58:50 +02:00
André
f661e51823 [Update] Remove revspec 2018-04-25 16:51:40 +02:00
André
a6810b81c6 [Update] Fix fetching by adding a refspec... 2018-04-24 13:00:53 +02:00
root
bfcfeeb1e8 Fix the fix for the fix for update.sh etc. 2018-04-18 18:38:37 +02:00
Pascal Jufer
90db5a30cb Fix initial compose project name 2018-04-13 14:13:24 +02:00
André Peters
182b7826bd Fix compose project name, take #3 2018-04-12 21:52:32 +02:00
André Peters
0ac3a66182 Additional fix for compose project name 2018-04-12 08:29:40 +02:00
André Peters
152ccba1d4
[Compose] Critical fix for project name
Docker-compose doesn't strip dashes and underscores anymore
2018-04-12 07:56:54 +02:00
André Peters
ce7643b3ad [Update] Remove parameter 2018-02-28 18:36:23 +01:00
eXtremeSHOK
d052a87cc3
Support for alpine linux
rebased on dev
replaces #1047
2018-02-20 10:31:01 +02:00
Peter
6db217d97e
Update update.sh
Should be `elif` instead of `if`
2018-02-10 18:26:20 +01:00
andre.peters
6118085890 [Compose] Expose SQL to 13306 on 127.0.0.1 2018-02-05 21:42:13 +01:00
andre.peters
96c0fbe78f [Update] Remove dc_params 2018-02-01 21:51:23 +01:00
andre.peters
6be0577638 [Compose] Allow to disable IPv6 2018-02-01 21:45:49 +01:00
andre.peters
5527d6fb94 [Update] Assume worker-controller-password.inc as unchanged on update 2018-02-01 13:35:18 +01:00
andre.peters
90fe52cc72 [Update] Use correct subnet for IPv6, allow --ours parameter to merge by gits ours strategy
[Update/config] Allow to set SNAT_TO_SOURCE
2018-02-01 13:32:40 +01:00
andre.peters
c7280e182f [Update] Add --ours parameter to override merge strategy 2018-02-01 09:40:08 +01:00
andre.peters
81c1ed9e4d [Update] Fix update check 2018-01-30 08:58:59 +01:00
andre.peters
120f26261d Fix var name.. 2018-01-27 12:24:00 +01:00
andre.peters
78334fe93e [Update] Crit fix for missing vars 2018-01-27 12:19:43 +01:00
andre.peters
8ce9d14e07 [Update] Better update check... 2018-01-26 22:40:00 +01:00
andre.peters
1f1ab0960c [Update] Formatting; Added new options 2018-01-24 09:24:40 +01:00
andre.peters
1c3a52172a [Update] Added --no-start parameter to update.sh 2018-01-21 15:03:46 +01:00
André Peters
74721c08bd
Merge branch 'master' into dev 2018-01-13 18:38:08 +01:00
andre.peters
1e9cae9084 [Compose] New images with LOG_LINES
[Update] Do not add empty line in each loop
2018-01-08 22:00:54 +01:00
maffo999
501731e7b9
Update update.sh
fixed a typo on line 82
2017-11-23 10:02:25 +01:00
andryyy
fc18d153cd [Compose, DockerAPI, Web, Watchdog] Watchdog may send notification mails (todo: docs), DockerAPI via Flesk for limited access 2017-10-05 23:38:33 +02:00
andryyy
a8fb1d3f4f Add experimental watchdog 2017-09-20 10:56:49 +02:00
andryyy
f7ff93a499 [Update] Stop mailcow before update 2017-09-16 23:24:30 +02:00
andryyy
344f88dbf3 [Update] Set merge.defaultToUpstream true 2017-09-13 19:25:54 +02:00
andryyy
538a99b956 [Update.sh] Move dependencies to loop 2017-09-08 10:02:50 +02:00
andryyy
5e8a130bda [Update.sh] Do not run docker-compose down 2017-09-08 09:55:53 +02:00
Maxim Baz
82043fcf80 Use different exit code on updates check
Enables some scripting, e.g. putting this in a cron job:

    ./update.sh --check && <notify-me-about-available-updates>
2017-09-04 21:28:24 +02:00
andryyy
d1f14bc62b [Update.sh] Test if var is int 2017-07-31 08:56:14 +02:00
andryyy
52231ac38d [update.sh] Remove , 2017-07-11 21:07:00 +02:00
andryyy
e1fc551bd2 [update.sh] Fix compose project name variable, add DOVEADM_PORT 2017-07-10 21:27:49 +02:00
andryyy
6d981b7f8d [update.sh] Missing echo, more information 2017-07-08 16:31:08 +02:00
andryyy
bdfaef09c6 [update.sh] Do not clean up dangling items, remove old image tags (not removed by dangling=true) 2017-07-08 16:22:48 +02:00
andryyy
94e5631662 [update.sh] Do not remove dangling volumes 2017-07-08 09:16:23 +02:00
andryyy
7fe6fba994 [update.sh] Add missing options to mailcow.conf, don't show reflog 2017-07-04 21:28:27 +02:00
andryyy
00395b99c6 Fetch origin before update check 2017-06-29 21:45:09 +02:00
andryyy
426b597d02 Fix update check 2017-06-29 21:24:07 +02:00
andryyy
bedd361059 Test new update check 2017-06-29 17:42:37 +02:00