From c35d99f8ef17e14458dffdb20b7f65b552a76cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 13 Jan 2016 11:05:11 +0100 Subject: [PATCH] hobo: discover portal-{user,agent} from template names (#9656) --- wcs/ctl/check_hobos.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wcs/ctl/check_hobos.py b/wcs/ctl/check_hobos.py index 303bd9b..26b8e27 100644 --- a/wcs/ctl/check_hobos.py +++ b/wcs/ctl/check_hobos.py @@ -285,6 +285,15 @@ class CmdCheckHobos(Command): continue domain = urlparse.urlparse(service.get('base_url')).netloc.split(':')[0] api_secrets[domain] = self.shared_secret(current_service.get('secret_key'), service.get('secret_key')) + if service.get('service-id') == 'combo': + if service.get('template_name') == 'portal-agent': + variables['portal_agent_url'] = service.get('base_url') + variables['portal_agent_title'] = service.get('title') + elif service.get('template_name') == 'portal-user': + variables['portal_url'] = service.get('base_url') + config.set('options', 'theme_skeleton_url', + service.get('base_url') + '__skeleton__/') + if self.all_services.get('variables'): for key, value in self.all_services.get('variables').items(): variables[key] = value -- 2.7.0.rc3