changeset 3564:2c9e95796371

plugin app manager: "public_url" must NOT have a schema
author Goffi <goffi@goffi.org>
date Fri, 11 Jun 2021 17:39:59 +0200
parents 267e4987b58b
children d66a8453b02b
files sat/plugins/plugin_misc_app_manager.py
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/sat/plugins/plugin_misc_app_manager.py	Fri Jun 11 09:21:41 2021 +0200
+++ b/sat/plugins/plugin_misc_app_manager.py	Fri Jun 11 17:39:59 2021 +0200
@@ -160,17 +160,19 @@
             )
 
         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