1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Commit Graph

1189 Commits

Author SHA1 Message Date
downtownallday
446f144821 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
#	management/mailconfig.py
#	setup/mail-users.sh
2024-07-21 17:29:08 -04:00
Joshua Tauberer
2ae8cd5713 v69a 2024-07-21 08:02:38 -04:00
Teal Dulcet
bc14e80b12
Fix no password prompt. Fixes #2408 (#2409) 2024-07-21 08:00:20 -04:00
Viktor Szépe
cd959bc522
Fix typos (#2406) 2024-07-21 07:01:25 -04:00
Joshua Tauberer
1b3e5e818c v69 2024-07-20 07:33:07 -04:00
Joshua Tauberer
2f5e736fa0 Clean up Nextcloud email settings for calendar invitations
I don't think anything is actually changed here but I think my box was missing some of these settings.
2024-07-20 07:27:46 -04:00
Chad Furman
c1bf722f82 Merge branch 'v68a-testing' 2024-07-12 13:55:00 -04:00
Chad Furman
7c7b744605 removing the ability to configure the default quota -- default quota is always unlimited. 2024-07-12 13:54:49 -04:00
downtownallday
20f9cd0f8c Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-07-10 20:01:50 -04:00
Chad Furman
bc4ff0f1e8 Merge branch 'v68a-testing' 2024-07-08 20:44:14 -04:00
Chad Furman
4e9c564c5d fixing cli commands 2024-07-08 20:37:42 -04:00
Chad Furman
1c66f69fd9 using migrations for alter table command 2024-07-08 20:25:46 -04:00
Chad Furman
8a1e803f48 removing duplicate conf 2024-07-08 20:14:47 -04:00
Chad Furman
3c6551b696 Merge remote-tracking branch 'upstrea/main' 2024-07-08 20:05:52 -04:00
Michael Heuberger
f118a6c0bf
Apply small Nextcloud upgrade to 26.0.13 (#2401) 2024-07-08 08:21:12 -04:00
downtownallday
771895a243 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	management/mail_log.py
2024-06-18 12:20:35 -04:00
jvolkenant
de0fc796d4
Fix chown during Nexcloud upgrades (#2377) 2024-06-18 08:37:01 -04:00
matidau
6321ce6ef0
Add php8.0-intl package to z-push setup (#2389) 2024-06-18 08:29:51 -04:00
matidau
30d78cd35a
Update zpush.sh to version 2.7.3 (#2390) 2024-06-18 08:29:22 -04:00
Chad Furman
0408ec36b8
Merge branch 'main' into master 2024-05-04 23:02:44 -04:00
Chad Furman
0cd8e4db62 fixing imap sed script 2024-05-04 22:22:47 -04:00
Chad Furman
51c483117d fixing parens 2024-05-04 21:15:05 -04:00
Chad Furman
173501e8b0 fixing imap sed script 2024-05-04 21:02:09 -04:00
Chad Furman
1795f8aefd bringing in quota changes 2024-04-27 18:41:35 -04:00
downtownallday
c9c0a51be2 Create temporary file in TMP not the current working directory 2024-04-03 12:51:22 -04:00
downtownallday
11e69f53a0 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	setup/firstuser.sh
#	setup/functions.sh
#	setup/mail-users.sh
#	setup/management.sh
#	setup/network-checks.sh
#	setup/nextcloud.sh
#	setup/questions.sh
#	setup/ssl.sh
#	setup/start.sh
#	setup/system.sh
#	setup/webmail.sh
#	tools/archive_conf_files.sh
#	tools/web_update
2024-04-03 12:45:10 -04:00
Teal Dulcet
c7faccf1fa Fixed SC2244: Prefer explicit -n to check non-empty string. 2024-04-03 09:22:50 -04:00
Teal Dulcet
ec497efa69 Quote echo commands to preserve whitespace. 2024-04-03 09:22:50 -04:00
Teal Dulcet
55a8be4aa9 Removed unnecessary bc commands. 2024-04-03 09:22:50 -04:00
Teal Dulcet
3399b25084 Replaced the pwd command with Bash's $PWD variable. 2024-04-03 09:22:50 -04:00
Teal Dulcet
2afd0451c1 Fixed SC2007: Use $((..)) instead of deprecated $[..]. 2024-04-03 09:22:50 -04:00
Teal Dulcet
27cf11d8ec Fixed SC2005: Useless echo. 2024-04-03 09:22:50 -04:00
Teal Dulcet
44d9f6eebd Fixed SC2236: Use -n instead of ! -z. 2024-04-03 09:22:50 -04:00
Teal Dulcet
4b7d4ba0a6 Fixed SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined. 2024-04-03 09:22:50 -04:00
Teal Dulcet
67bcaea71e Fixed SC2091: Remove surrounding $() to avoid executing output. 2024-04-03 09:22:50 -04:00
Teal Dulcet
bdf4155bed Fixed SC2046: Quote to prevent word splitting. 2024-04-03 09:21:34 -04:00
Teal Dulcet
f1888f2043 Fixed SC2148: Add a shebang. 2024-04-03 09:21:34 -04:00
Teal Dulcet
33559bb844 Fixed SC2164: Use 'cd ... || exit' in case cd fails. 2024-04-03 09:21:34 -04:00
Teal Dulcet
30c4681e80 Fixed SC2086: Double quote to prevent globbing and word splitting. 2024-04-03 09:20:20 -04:00
downtownallday
1be8257b20 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	CHANGELOG.md
#	README.md
2024-04-01 17:57:03 -04:00
Joshua Tauberer
830c83daa1 v68 2024-04-01 10:55:52 -04:00
downtownallday
6ade958e2d Merge remote-tracking branch 'upstream/main' into merge-upstream 2024-03-23 17:50:34 -04:00
Joshua Tauberer
fa72e015ee Update SMTP Smuggling protection to the 'long-term fix'
* Revert "Guard against SMTP smuggling", commit faf23f150c, by restoring the setting to its default.
* Revert "[security] SMTP smuggling: update short term fix (#2346)", commmit e931e103fe, by restoring the setting to its default.
* Set smtpd_forbid_bare_newline=normalize.
2024-03-23 13:15:32 -04:00
jvolkenant
163b1a297e
Silence "wal" output on setup using hide_output (#2368) 2024-03-23 08:49:24 -04:00
downtownallday
d349150dd0 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	.gitignore
#	management/auth.py
#	management/daemon.py
#	management/mail_log.py
#	management/mailconfig.py
#	management/mfa.py
#	management/ssl_certificates.py
#	management/status_checks.py
#	management/utils.py
#	management/web_update.py
#	setup/mail-postfix.sh
#	setup/migrate.py
#	setup/preflight.sh
#	setup/webmail.sh
#	tests/test_mail.py
#	tools/editconf.py
2024-03-12 07:41:14 -04:00
Joshua Tauberer
18b8f9ab4b Revert "Allow customizations to Roundcube settings to persist between updates by including a configuration override file, if it exists (#2333)"
This reverts commit 1b8cdeb644.

It didn't execute. I should have tried it first.
2024-03-10 08:25:34 -04:00
KiekerJan
0b1d92388a
Take spamhaus return codes into account in status check and postfix config (#2332) 2024-03-10 08:09:36 -04:00
Crag-Monkey
1b8cdeb644
Allow customizations to Roundcube settings to persist between updates by including a configuration override file, if it exists (#2333) 2024-03-10 08:02:16 -04:00
Bastian Bittorf
1053340124
setup/preflight.sh: fix some minor shellcheck complaints (#2342)
This file passes shellcheck now without errors.
This paritally fixes #1457 - the former errors where:

$ shellcheck setup/preflight.sh

In setup/preflight.sh line 1:
^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.

In setup/preflight.sh line 29:
if [ $TOTAL_PHYSICAL_MEM -lt 490000 ]; then
     ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean:
if [ "$TOTAL_PHYSICAL_MEM" -lt 490000 ]; then

In setup/preflight.sh line 31:
	TOTAL_PHYSICAL_MEM=$(expr \( \( $TOTAL_PHYSICAL_MEM \* 1024 \) / 1000 \) / 1000)
                             ^--^ SC2003 (style): expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].
                                        ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean:
	TOTAL_PHYSICAL_MEM=$(expr \( \( "$TOTAL_PHYSICAL_MEM" \* 1024 \) / 1000 \) / 1000)

In setup/preflight.sh line 38:
if [ $TOTAL_PHYSICAL_MEM -lt 750000 ]; then
     ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean:
if [ "$TOTAL_PHYSICAL_MEM" -lt 750000 ]; then

For more information:
  https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...
  https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ...
  https://www.shellcheck.net/wiki/SC2003 -- expr is antiquated. Consider rewr...
2024-03-10 08:01:13 -04:00
Teal Dulcet
775a4223de Fixed F821 (undefined-name): Undefined name e 2024-03-10 07:56:49 -04:00
Teal Dulcet
f0377dd59e Fixed SIM105 (suppressible-exception) 2024-03-10 07:56:49 -04:00
Teal Dulcet
0e9193651d Fixed PLW1514 (unspecified-encoding): open in text mode without explicit encoding argument 2024-03-10 07:56:49 -04:00
Teal Dulcet
c719fce40a Fixed UP032 (f-string): Use f-string instead of format call 2024-03-10 07:56:49 -04:00
Teal Dulcet
ec32e1d578 Fixed E703 (useless-semicolon): Statement ends with an unnecessary semicolon 2024-03-10 07:56:49 -04:00
Teal Dulcet
14a5613dc8 Fixed UP031 (printf-string-formatting): Use format specifiers instead of percent format 2024-03-10 07:54:51 -04:00
KiekerJan
293d56c781
Update javascript libraries used by control panel (#2351) 2024-03-10 07:26:33 -04:00
KiekerJan
040d0cbb7c
Update roundcube to 1.6.6 (#2360) 2024-03-10 07:24:29 -04:00
Michael Heuberger
111468efb9
Bump Nextcloud to v26.0.12 (#2310)
Also
- bumps calendar and contacts apps
- reformats some comments (line-breaking)
- adds extra comments for the next developer
2024-03-10 07:22:51 -04:00
John James Jacoby
4ad679da47
Issue-2354: Silence "wal" output on setup (#2356)
Silence "wal" output from RoundCube Sqlite customization, inside of webmail.sh.

Co-authored-by: solomon-s-b

Fixes #2354.
2024-03-10 07:16:03 -04:00
downtownallday
38ad0d3cd6 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-01-10 09:52:53 -05:00
KiekerJan
e931e103fe
[security] SMTP smuggling: update short term fix (#2346)
Update short term fix according to postfix advisory at https://www.postfix.org/smtp-smuggling.html.
2024-01-10 09:34:06 -05:00
downtownallday
96b315c368 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2023-12-22 18:59:26 -05:00
Joshua Tauberer
7646095b94 v67 2023-12-22 08:56:43 -05:00
Joshua Tauberer
faf23f150c Guard against SMTP smuggling
This short-term workaround is recommended at https://www.postfix.org/smtp-smuggling.html:

    smtpd_data_restrictions=reject_unauth_pipelining
2023-12-22 08:54:15 -05:00
downtownallday
b88845190f Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2023-12-18 13:47:57 -05:00
Joshua Tauberer
8e4e9add78 Version 66 2023-12-17 16:31:18 -05:00
downtownallday
ed963fa65c Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	setup/bootstrap.sh
#	setup/webmail.sh
2023-12-05 09:08:32 -05:00
KiekerJan
fa8c7ddef5
Upgrade roundcube to 1.6.5 (#2329) 2023-12-04 09:23:36 -05:00
bilogic
6d6ce25e03
Allow specifying another repo to install from in bootstrap.sh (#2334) 2023-12-04 09:22:54 -05:00
downtownallday
d0da88b2ba Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2023-11-28 07:32:59 -05:00
Joshua Tauberer
371f5bc1b2 Fix virtualenv creation reported in #2335 2023-11-28 07:25:50 -05:00
downtownallday
7cbc9254ce Merge remote-tracking branch 'kiekerjan/roundcube165' into roundcube-upgrade
# Conflicts:
#	setup/webmail.sh
2023-11-06 06:47:55 -05:00
KiekerJan
d976a8b838 upgrade roundcube to 1.6.5 2023-11-05 21:26:44 +01:00
downtownallday
2b638042cb Reduce retained slapd logs from 1 year to 3 months 2023-11-01 06:20:40 -04:00
downtownallday
4b71b0f5b4 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	README.md
#	setup/webmail.sh
2023-10-29 13:19:38 -04:00
Joshua Tauberer
0314554207 Version 65 2023-10-27 06:02:22 -04:00
matidau
46d55f7866
Update zpush.sh to version 2.7.1 (#2315)
Updating to latest release, bugfixes no new features.
2023-10-26 09:04:13 -04:00
KiekerJan
2bbc317873
Update Roundcube to 1.6.4 (#2317) 2023-10-26 09:03:29 -04:00
downtownallday
2a240977b3 Update roundcube to 1.6.4 2023-10-17 10:13:06 -04:00
downtownallday
75baac8d60 Update rsyslog's postfix configuration, which creates a socket in postfix's chroot 2023-10-06 05:50:16 -04:00
downtownallday
c816669073 Even though smtpd is not chrooted, move auth socket back to postfix's chroot/working directory anyway. 2023-10-06 05:48:52 -04:00
downtownallday
7abd7b3da6 Tighten permissions of the shared postfix/dovecot auth socket 2023-10-05 21:53:46 -04:00
downtownallday
bc2bc02a57 Add a setup mod to move postfix queue to /home/user-data 2023-10-05 17:58:26 -04:00
downtownallday
f9f39d7715 Move dovecot auth socket location from postfix's directory to dovecot's 2023-10-05 17:57:46 -04:00
downtownallday
b11309b624 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2023-09-02 19:58:38 -04:00
Joshua Tauberer
e419b62034 Version 64 2023-09-02 19:46:24 -04:00
downtownallday
5fc9edb3d7 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2023-09-02 07:19:32 -04:00
Aaron Ten Clay
62efe985f1
Disable OpenDMARC sending reports (#2299)
OpenDMARC report messages, while potentially useful for peer operators of mail servers, are abusable and should not be enabled by default. This change prioritizes the safety of the Box's reputation.
2023-09-02 07:10:04 -04:00
Alex
df44056bae
Fix checksums in nextcloud.sh (#2293) 2023-09-02 07:07:12 -04:00
Michael Heuberger
81866de229
Amend --always option to all git describe commands (#2275) 2023-09-02 06:59:39 -04:00
matidau
674ce92e92
Fix z-push-admin broken in v60 (#2263)
Update zpush.sh to create two sbin bash scripts for z-push-admin and z-push-top using PHP_VER.
2023-09-02 06:55:15 -04:00
downtownallday
af3357cd46 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2023-08-02 08:30:08 -04:00
Joshua Tauberer
cd45d08409 Version 63 2023-07-29 12:11:29 -04:00
downtownallday
3774a78b03 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	setup/nextcloud.sh
2023-06-16 17:32:28 -04:00
Michael Heuberger
98628622c7
Bump Nextcloud to v25.0.7 (#2268)
Also
- bumps calendar and contacts apps
- adds extra migration steps between these versions
- adds cron job for Calendar updates
- rotates nextloud log file after upgrading
- adds primary key indices migrations
- adjusts configs slightly
- adds more well-known entries in nginx to improve service discovery
- reformats some comments (line-breaking)
2023-06-16 11:49:55 -04:00
downtownallday
d956166164 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2023-05-21 07:23:55 -04:00
Joshua Tauberer
8b19d15735 Version 62 2023-05-20 08:57:32 -04:00
downtownallday
6a7fc1594d Remove z-push hacks 2023-05-13 13:15:00 -04:00
downtownallday
8270f34acb Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	setup/webmail.sh
2023-05-13 12:29:18 -04:00
matidau
93380b243f
Update zpush.sh to version 2.7.0 (#2236) 2023-05-13 10:27:42 -04:00