diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-05-14 00:45:02 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-06-01 17:03:42 +0100 |
| commit | ce311a3c803515eb95c761a3a2838b093a4ea3cd (patch) | |
| tree | 6b76255fbc150abf7e8b7ce077b1c511114c816c /lorry-controller-webapp | |
| parent | 38697c01cc12c4e8cc57b3bb372c5cf5f34ce167 (diff) | |
| download | lorry-controller-ce311a3c803515eb95c761a3a2838b093a4ea3cd.tar.gz | |
Introduce and use downstream-{http,ssh}-url settings
Replace the current hardcoded Downstream Host parameters with
application settings.
In general, Downstream Host connectors will use some combination of
HTTP(S) and/or SSH, so these are added in lorry-controller-webapp.
Currently only the gerrit connector will use downstream-ssh-url
and only the gitlab connector will use downstream-http-url.
Turn *on* StrictHostKeyChecking for the gerrit connector when not
talking to localhost.
Closes #4.
Diffstat (limited to 'lorry-controller-webapp')
| -rwxr-xr-x | lorry-controller-webapp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lorry-controller-webapp b/lorry-controller-webapp index 6fc827e..e60f00c 100755 --- a/lorry-controller-webapp +++ b/lorry-controller-webapp @@ -143,6 +143,16 @@ class WEBAPP(cliapp.Application): ['publish-failures'], 'make the status page show failure logs from lorry') + self.settings.string( + ['downstream-ssh-url'], + 'URL for Downstream Host SSH service (Gerrit)', + metavar='URL') + + self.settings.string( + ['downstream-http-url'], + 'URL for Downstream Host HTTP(S) service (GitLab)', + metavar='URL') + for downstream_type in lorrycontroller.downstream_types.values(): downstream_type.add_app_settings(self.settings) |