Merge branch 'master' into feature-alternative-domains

admin/mailu/__init__.py

@@ -46,7 +46,9 @@ login_manager = flask_login.LoginManager()
 login_manager.init_app(app)
 babel = flask_babel.Babel(app)
 translations = list(map(str, babel.list_translations()))
-scheduler = background.BackgroundScheduler()
+scheduler = background.BackgroundScheduler({
+    'apscheduler.timezone': 'UTC'
+})
 
 # Manager commnad
 manager = flask_script.Manager(app)

admin/mailu/admin/views/managers.py

@@ -23,7 +23,7 @@ def manager_create(domain_name):
     ]
     if form.validate_on_submit():
         user = models.User.query.get(form.manager.data)
-        if user not in available_users:
+        if user.email not in [user.email for user in available_users]:
             flask.abort(403)
         elif user in domain.managers:
             flask.flash('User %s is already manager' % user, 'error')

admin/mailu/certbot.py

@@ -44,7 +44,7 @@ def certbot_install(domain):
 
 
 @scheduler.scheduled_job('date')
-@scheduler.scheduled_job('cron', hour=96, minute=0)
+@scheduler.scheduled_job('cron', day='*/4', hour=0, minute=0)
 def generate_cert():
     print("Generating TLS certificates using Certbot")
     hostname = app.config["HOSTNAME"]