From 35659893bec1b5cd8578bdef07dfc4088d9a595b Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 11 Jun 2021 17:39:59 +0200 Subject: [PATCH] plugin app manager: "public_url" must NOT have a schema --- sat/plugins/plugin_misc_app_manager.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sat/plugins/plugin_misc_app_manager.py b/sat/plugins/plugin_misc_app_manager.py index 840f0de4..009e746e 100644 --- a/sat/plugins/plugin_misc_app_manager.py +++ b/sat/plugins/plugin_misc_app_manager.py @@ -160,17 +160,19 @@ class AppManager: ) value = self.host.memory.getConfig(section, name, default) - if name == "public_url" and (not value or not value.startswith('http')): + # FIXME: "public_url" is used only here and doesn't take multi-sites into account + if name == "public_url" and (not value or value.startswith('http')): if not value: log.warning(_( - 'No value found for "public_url", using "https://example.org" for ' - 'now, please set the proper value in sat.conf')) + 'No value found for "public_url", using "example.org" for ' + 'now, please set the proper value in libervia.conf')) else: log.warning(_( - 'invalid value for "public_url" ({value}), it must start with ' - '"http", ignoring it and using "https://example.org" instead') + 'invalid value for "public_url" ({value}), it musts not start with ' + 'schema ("http"), ignoring it and using "example.org" ' + 'instead') .format(value=value)) - value = "https://example.org" + value = "example.org" if filter_ is None: pass