Do not alter global variable
This commit is contained in:
6
run.py
6
run.py
@@ -197,9 +197,9 @@ def main(input_args):
|
|||||||
config.set("modoboa", "install_beta", str(args.beta))
|
config.set("modoboa", "install_beta", str(args.beta))
|
||||||
|
|
||||||
if config.get("antispam", "type") == "amavis":
|
if config.get("antispam", "type") == "amavis":
|
||||||
PRIMARY_APPS += ["amavis", "opendkim"]
|
antispam_apps = ["amavis", "opendkim"]
|
||||||
else:
|
else:
|
||||||
PRIMARY_APPS += ["rspamd"]
|
antispam_apps = ["rspamd"]
|
||||||
|
|
||||||
if args.backup or args.silent_backup:
|
if args.backup or args.silent_backup:
|
||||||
backup_system(config, args)
|
backup_system(config, args)
|
||||||
@@ -242,7 +242,7 @@ def main(input_args):
|
|||||||
ssl_backend = ssl.get_backend(config)
|
ssl_backend = ssl.get_backend(config)
|
||||||
if ssl_backend and not args.upgrade:
|
if ssl_backend and not args.upgrade:
|
||||||
ssl_backend.generate_cert()
|
ssl_backend.generate_cert()
|
||||||
for appname in PRIMARY_APPS:
|
for appname in PRIMARY_APPS + antispam_apps:
|
||||||
scripts.install(appname, config, args.upgrade, args.restore)
|
scripts.install(appname, config, args.upgrade, args.restore)
|
||||||
system.restart_service("cron")
|
system.restart_service("cron")
|
||||||
package.backend.restore_system()
|
package.backend.restore_system()
|
||||||
|
|||||||
Reference in New Issue
Block a user