external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-16 17:47:23 +01:00
Code Issues Releases Wiki Activity

Drop some hacks that we needed for Ubuntu 18.04

Browse Source 
* certbot's PPA is no longer needed because a recent version is now included in the Ubuntu respository.
* Un-pin b2sdk (reverts 69d8fdef99 and d829d74048).
* Revert boto+s3 workaround for duplicity (partial revert of 99474b348f).
* Revert old "fix boto 2 conflict on Google Compute Engine instances" (cf33be4596) which is probably no longer needed.
This commit is contained in:
Joshua Tauberer
2022-01-08 19:09:30 -05:00
parent 78569e9a88
commit b41a0ad80e
5 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
management/daemon.py
View File

@@ -121,7 +121,6 @@ def index():
no_users_exist = (len(get_mail_users(env)) == 0)
no_admins_exist = (len(get_admins(env)) == 0)
utils.fix_boto() # must call prior to importing boto
import boto.s3
backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()]