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

254 Commits

Author SHA1 Message Date
downtownallday
1a0b94c878 restore backup: don't automatically unmount an ehdd drive 2022-10-14 15:02:44 -04:00
downtownallday
16679aa5ac preloaded: add support for clone at commit 2022-10-14 14:18:34 -04:00
downtownallday
2f19ec19da Update tags now that upstream has merged jammy branch 2022-10-12 08:22:05 -04:00
Joshua Tauberer
ddf8e857fd
Support Ubuntu 22.04 Jammy Jellyfish (#2083) 2022-10-11 21:18:34 -04:00
downtownallday
d786fa2790 Hide apt output when installing duplicity 2022-10-11 08:19:51 -04:00
downtownallday
26fa200014 Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
# Conflicts:
#	setup/management.sh
#	setup/nextcloud.sh
2022-10-09 09:30:12 -04:00
downtownallday
cc54379ed2 Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
# Conflicts:
#	management/backup.py
2022-09-29 11:10:16 -04:00
downtownallday
9a381961c5 setting permissions on mail.log fixes the github actions failure for upgrade-to-upstream - this is just clean up 2022-09-22 18:31:59 -04:00
downtownallday
35aa9f7691 try setting mail.log permissions during setup 2022-09-22 18:06:03 -04:00
downtownallday
c9eb90800b flush logs on other log scanning functions 2022-09-22 17:34:22 -04:00
downtownallday
4531c90434 restart rsyslogd on GITHUB_ACTIONS=true instead of HUP 2022-09-22 16:56:24 -04:00
downtownallday
86a61a7b12 try to deal with the flurry of messages from rsyslogd after a HUP on github actions 2022-09-22 15:53:45 -04:00
downtownallday
e0f2ba84e2 update .gitignore 2022-09-22 13:41:42 -04:00
downtownallday
f71b5f3229 Add additional vagrant definition that automatically connects to a cloudinabox 2022-09-22 11:10:16 -04:00
downtownallday
892c33af07 Automatically install .emacs on test vms 2022-09-22 11:08:46 -04:00
downtownallday
9ac1bdd045 LOCAL_MODS_DIR must be absolute 2022-09-21 19:04:18 -04:00
downtownallday
188eb9bee1 update test to get syslog output 2022-09-21 16:46:38 -04:00
downtownallday
53cbabac75 Fix url redirection when a remote nextcloud is used so that .well-known/caldav and carddav work properly, as well as the redirecting /cloud to the remote Nextcloud. Since the nginx config is replaced by the management daemon whenever a new domain is added, this change adds a hooking mechanism for setup mods.Fix url redirection when a remote nextcloud is in use. This corrects redirection for /.well-known/caldav, /.well-known/carddav and /cloud to send the client to the remote nextcloud. This requires an nginx configuration change, and since the nginx config is replaced by the management daemon whenever a new domain is added, this change adds a hooking mechanism for setup mods allowing them to intercept and modify the resultant nginx config. 2022-09-21 15:52:47 -04:00
downtownallday
39aaf94e7b Add options to 1. re-use existing an existing backup 2. disable test runner 2022-09-20 10:15:36 -04:00
downtownallday
f321271e1c Adjust formatting 2022-09-20 10:14:10 -04:00
downtownallday
bf63ca827e Add copyright to source files 2022-09-19 14:45:11 -04:00
downtownallday
809a75765e replace FLASK_ENV, which has been deprecated, with FLASK_DEBUG 2022-09-18 15:44:01 -04:00
downtownallday
20646e43f8 single restore_backup script for miab and ciab 2022-09-06 11:47:04 -04:00
downtownallday
78e6755e6b wait for the management daemon to be ready before ending the test 2022-09-05 20:35:36 -04:00
downtownallday
b731de2f66 fix capture state and populate working directory errors 2022-09-05 18:34:46 -04:00
downtownallday
d87148292e fix missing $ 2022-09-05 17:08:41 -04:00
downtownallday
f63488aa1a Merge branch 'master' into jammyjellyfish2204
# Conflicts:
#	setup/management.sh
#	setup/mods.available/connect-nextcloud-to-miab.sh
#	setup/start.sh
#	setup/webmail.sh
#	tests/lib/carddav.sh
#	tests/lib/system.sh
#	tests/system-setup/setup-defaults.sh
#	tests/system-setup/setup-funcs.sh
#	tests/system-setup/upgrade.sh
2022-09-05 10:30:45 -04:00
downtownallday
a7739196b4 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204 2022-09-05 09:28:26 -04:00
downtownallday
f6cd8f56c3 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2022-08-21 14:07:30 -04:00
Sudheesh Singanamalla
d7244ed920
Fixes #2149 Append ; in policy strings for DMARC settings (#2151)
Signed-off-by: Sudheesh Singanamalla <sudheesh@cloudflare.com>
2022-08-19 13:23:42 -04:00
Rauno Moisto
78569e9a88 Fix DeprecationWarning in dnspython query vs resolve method
The resolve method disables resolving relative names by default. This change probably makes a7710e90 unnecessary. @JoshData added some additional changes from query to resolve.
2022-07-28 14:02:46 -04:00
downtownallday
27dcb5d7ca Enable fail2ban for z-push and add a test for it 2022-07-18 15:52:04 -04:00
downtownallday
ecf5e3ddfb Improve output formatting 2022-06-29 12:56:44 -04:00
downtownallday
8f1bb4f498 Add a z-push test suite 2022-06-29 10:42:09 -04:00
downtownallday
643a49676e rename ehdd/startup.sh ehdd/run-this-after-reboot.sh 2022-06-28 20:56:48 -04:00
downtownallday
9b8fc905f6 rename script "remote-nextcloud-use-miab.sh" to "connect-nextcloud-to-miab.sh" 2022-06-28 16:43:27 -04:00
downtownallday
13d8e867a2 Add color to the output 2022-06-27 14:28:59 -04:00
downtownallday
d4cbaaf356 Ensure users and groups are created so that duplicity properly restores permissions 2022-06-27 13:06:59 -04:00
downtownallday
8838d5af82 Eliminate the manual firewall configuration step when connecting a remote Nextcloud's user_ldap 2022-06-27 11:00:36 -04:00
downtownallday
5c5d5c2aff Add a major upgrade test - bionic to jammy 2022-06-26 22:16:04 -04:00
downtownallday
6255ecb2f3 Include postfix, dovecot, opendkim in preloaded vm 2022-06-26 22:13:16 -04:00
downtownallday
f05fa8ba01 Simplify alternate repo/branch installation 2022-06-26 22:10:47 -04:00
downtownallday
cb76aec59d Tests that run php should run the version of php selected by setup 2022-06-25 12:37:11 -04:00
downtownallday
1423246419 Better handling of git formatted versions
eg "v57a-6-g82599e5"
2022-06-23 17:46:50 -04:00
downtownallday
7bc77f644f Since JT decided to go with php 8.0 over 8.1, revert to roundcube 1.5.2 for vanilla vagrantfile 2022-06-22 16:22:35 -04:00
downtownallday
82599e542e If git describe fails, assume new undetermined version 2022-06-22 12:01:01 -04:00
downtownallday
65a393cb3f Fix the installed state version parsing logic 2022-06-22 11:21:22 -04:00
downtownallday
1622b326d5 Update version used for upgrade-to-master tests 2022-06-22 11:20:41 -04:00
downtownallday
cab78e8d9a Change comment 2022-06-22 11:19:58 -04:00
downtownallday
8e6e4480b2 Output message about ignoring errors 2022-06-22 11:19:33 -04:00
downtownallday
c135bf1f77 Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
# Conflicts:
#	CHANGELOG.md
#	README.md
#	conf/nginx-top.conf
#	management/backup.py
#	setup/bootstrap.sh
#	setup/management.sh
#	setup/nextcloud.sh
#	setup/system.sh
#	setup/web.sh
#	setup/webmail.sh
#	setup/zpush.sh
#	tests/test_mail.py
2022-06-21 23:58:17 -04:00
Rauno Moisto
07d850e751 Fix DeprecationWarning in dnspython query vs resolve method
The resolve method disables resolving relative names by default. This change probably makes a7710e90 unnecessary. @JoshData added some additional changes from query to resolve.
2022-06-19 05:45:29 -04:00
downtownallday
6ff93bb87e add miab directory as 'safe' for git 2022-06-05 21:34:59 -04:00
downtownallday
ee8d627c3b Improve formatting of setup output 2022-06-05 21:34:52 -04:00
downtownallday
6dbab427f9 enable nextcloud installation 2022-05-04 11:20:54 -04:00
downtownallday
e57e1a6252 add miab directory as 'safe' for git 2022-05-04 11:19:46 -04:00
downtownallday
ee1ffbdb21 Workaround vagrant's inability to authenticate during vagrant up (but can authenticate with vagrant ssh) 2022-04-09 18:55:11 -04:00
downtownallday
70475cc294 Allow the nextcloud service account to be able to change user account passwords.
This should be removed once Nextcloud Server iss 18406 is fixed.
2022-04-08 10:05:34 -04:00
downtownallday
e5ba7f8ceb improve output formatting 2022-04-08 06:57:16 -04:00
downtownallday
8e58a78b94 Upgrade system packages during system-setup 2022-03-06 10:53:53 -05:00
downtownallday
a6c819eea0 Improve formatting of setup output 2022-03-06 10:53:00 -05:00
downtownallday
94f140d528 Prevent duplicate logging of mail-related output by configuring rsyslog to record only to mail.log and not also to syslog 2022-02-28 07:11:58 -05:00
downtownallday
2c6474385e Address issues with postgrey, nsd, and rsyslogd introduced with jammy
1. `systemctl reload postgrey` is broken, so use restart in that case
2. `systemctl restart nsd` succeeds once /var/log is writable by systemd. However, nsd still fails to write to /var/log/nsd.log if the file already exists
3. the default configuration for rsyslogd is to no longer create a /var/run/rsyslogd.pid file, so use /usr/bin/pidof in that case
2022-02-25 19:45:46 -05:00
downtownallday
ad5a647d36 Install latest roundcube (master) which supports php 8.1 2022-02-25 19:38:16 -05:00
downtownallday
15bcf678d9 Fixes to vagrant box creation for jammy 2022-02-25 19:35:25 -05:00
downtownallday
46e0e6ff39 Get rid of globals.sh 2022-01-29 10:59:02 -05:00
downtownallday
bdeb27c3f3 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
2022-01-20 06:58:40 -05:00
downtownallday
4e6550ed22 Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
# Conflicts:
#	README.md
#	setup/mail-dovecot.sh
#	setup/system.sh
#	setup/webmail.sh
#	setup/zpush.sh
#	tests/test_mail.py
2022-01-11 16:39:39 -05:00
downtownallday
d6cd4e826c Ensure pip3 is installed before installing email_validator 2022-01-11 09:53:07 -05:00
Rauno Moisto
22fc612a82 Fix DeprecationWarning in dnspython query vs resolve method
The resolve method disables resolving relative names by default. This change probably makes a7710e90 unnecessary. @JoshData added some additional changes from query to resolve.
2022-01-08 20:07:32 -05:00
downtownallday
1828538646 Refresh script for latest roundcube carddav plugin
Belongs with last commit...
2021-11-15 16:08:43 -05:00
downtownallday
06216876a2 Update roundcube carddav plugin to support roundcube 1.5 and close a security hole 2021-11-15 16:07:54 -05:00
downtownallday
3bb6f021a7 Fix tests that were broken by commit bb54370 2021-10-27 08:20:07 -04:00
downtownallday
db8e0fdf66 Remove /etc/ldap/ldap.conf creation as it's now created by the Nextcloud docker image 2021-10-27 08:19:32 -04:00
downtownallday
66ac35871e Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
Upstream is adding handling for utf8 domains by creating a domain alias @utf8 -> @idna. I'm deviating from this approach by setting multiple email address (idna and utf8) per user and alias where a domain contains non-ascii characters. The maildrop (mailbox) remains the same - all mail goes to the user's mailbox regardless of which email address was used. This is more in line with how other systems (eg. active directory), handle multiple email addresses for a single user.

# Conflicts:
#	README.md
#	management/mailconfig.py
#	management/templates/index.html
#	setup/dns.sh
#	setup/mail-users.sh
2021-10-01 17:43:48 -04:00
downtownallday
9ea03e18c9 automatically install avahi for systems with a .local tld 2021-09-14 09:56:19 -04:00
downtownallday
4b285c3201 Prepare for multiple base system support and automatically update and remove stale vagrant boxes 2021-09-14 08:20:37 -04:00
downtownallday
3d32dbab22 Explicitly create a /etc/ldap/ldap.conf in the docker image so ldap tools recognize the system's trusted root certificate list 2021-09-14 08:18:53 -04:00
downtownallday
402207714b Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	management/auth.py
#	management/daemon.py
#	management/templates/index.html
#	setup/management.sh
2021-09-14 08:16:08 -04:00
Joshua Tauberer
e884c4774f Replace HMAC-based session API keys with tokens stored in memory in the daemon process
Since the session cache clears keys after a period of time, this fixes #1821.

Based on https://github.com/mail-in-a-box/mailinabox/pull/2012, and so:

Co-Authored-By: NewbieOrange <NewbieOrange@users.noreply.github.com>

Also fixes #2029 by not revealing through the login failure error message whether a user exists or not.
2021-09-06 09:23:58 -04:00
downtownallday
be932af813 git remote url does not contain .git extension in github actions 2021-08-23 16:17:07 -04:00
downtownallday
0876a9a7de non-standard git remotes in github actions 2021-08-23 16:01:16 -04:00
downtownallday
0c2c76a6dc Patch upstream to install php-xml instead of php-xsl 2021-08-23 15:17:33 -04:00
downtownallday
c29eb2fb23 add 127.0.1.1 if it does not exist 2021-08-23 14:31:31 -04:00
downtownallday
f8a679b9c2 ensure system hostname is resolvable locally 2021-08-23 14:15:18 -04:00
downtownallday
fc4ad70535 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	management/dns_update.py
#	management/web_update.py
#	tests/test_mail.py
2021-05-15 22:35:48 -04:00
Joshua Tauberer
d510c8ae2a Enable and recommend port 465 for mail submission instead of port 587 (fixes #1849)
Port 465 with "implicit" (i.e. always-on) TLS is a more secure approach than port 587 with explicit (i.e. optional and only on with STARTTLS). Although we reject credentials on port 587 without STARTTLS, by that point credentials have already been sent.
2021-05-15 16:42:14 -04:00
Downtown Allday
a697cd2f01 Reflect new upstream default branch 2021-04-13 00:12:27 -04:00
downtownallday
3be7ba7c86 Set the default interface for bridged networks to avoid interactive 'vagrant up'.
Thx to https://stackoverflow.com/questions/33250304/how-to-automatically-select-bridged-network-interfaces-in-vagrant
2021-04-07 09:24:12 -04:00
downtownallday
2a0e50c8d4 Initial commit of a log capture and reporting feature
This adds a new section to the admin panel called "Activity", that
supplies charts, graphs and details about messages entering and leaving
the host.

A new daemon captures details of system mail activity by monitoring
the /var/log/mail.log file, summarizing it into a sqllite database
that's kept in user-data.
2021-01-11 18:02:07 -05:00
downtownallday
e7c5a841aa Merge branch 'jvolk-spf-opendd' 2020-12-26 07:55:30 -05:00
downtownallday
f5521b45b5 Add tests for dmarc reject and spf softfail 2020-12-21 08:46:12 -05:00
downtownallday
4c9bae5176 Create a default "pre-commit" set of virtual machines 2020-11-27 16:51:10 -05:00
downtownallday
f81e0d0a85 syncing up box creation with ciab (prepping for focal) 2020-11-05 21:07:50 -05:00
downtownallday
87142fb194 change comment 2020-11-05 16:33:44 -05:00
downtownallday
e43c01e6fe Enable caching of Nextcloud downloads as well as downloading Nextcloud from github instead of Nextcloud servers 2020-11-05 16:19:42 -05:00
downtownallday
aeb27f74e3 Break out MiaB-LDAP code from _init.sh so _init.sh can be shared with cloud-in-a-box 2020-11-02 12:59:59 -05:00
downtownallday
484ffd64ec do upgrade tests against maib master 2020-10-31 11:32:28 -04:00
downtownallday
a7370beae0 Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp
# Conflicts:
#	management/daemon.py
#	management/mfa.py
2020-10-29 16:56:36 -04:00
downtownallday
a78e6eb3fa Speed up vm creation 2020-09-30 13:33:40 -04:00