diff --git a/runbot/data/runbot_data.xml b/runbot/data/runbot_data.xml index d6fde41c..cd723d7b 100644 --- a/runbot/data/runbot_data.xml +++ b/runbot/data/runbot_data.xml @@ -47,6 +47,11 @@ admin_passwd=running_master_password ^((master)|(saas-)?\d+\.\d+)$ + + runbot.use_ssl + True + + runbot.runbot_forwardport_author fw-bot diff --git a/runbot/models/res_config_settings.py b/runbot/models/res_config_settings.py index 196264f1..f486aca4 100644 --- a/runbot/models/res_config_settings.py +++ b/runbot/models/res_config_settings.py @@ -28,6 +28,7 @@ class ResConfigSettings(models.TransientModel): runbot_forwardport_author = fields.Char('Forwardbot author') runbot_organisation = fields.Char('Organisation') runbot_disable_host_on_fetch_failure = fields.Boolean('Disable host on fetch failure') + runbot_use_ssl = fields.Boolean('Use ssl for workers', help="select if worker ressources (log, dump, ...) uses ssl or not.", config_parameter="runbot.use_ssl") runbot_db_gc_days = fields.Integer( 'Days before gc', diff --git a/runbot/tests/test_upgrade.py b/runbot/tests/test_upgrade.py index 09044bf3..ac290b0a 100644 --- a/runbot/tests/test_upgrade.py +++ b/runbot/tests/test_upgrade.py @@ -421,7 +421,7 @@ class TestUpgradeFlow(RunbotCase): source_dest = current_build.params_id.dump_db.build_id.dest def docker_run_restore(cmd, *args, **kwargs): - dump_url = f'http://host.runbot.com/runbot/static/build/{source_dest}/logs/{source_dest}-{suffix}.zip' + dump_url = f'https://host.runbot.com/runbot/static/build/{source_dest}/logs/{source_dest}-{suffix}.zip' zip_name = f'{source_dest}-{suffix}.zip' db_name = f'{current_build.dest}-{suffix}' self.assertEqual( diff --git a/runbot/views/res_config_settings_views.xml b/runbot/views/res_config_settings_views.xml index 18603298..9b7f807a 100644 --- a/runbot/views/res_config_settings_views.xml +++ b/runbot/views/res_config_settings_views.xml @@ -25,6 +25,10 @@