Add support for non-ssh URLs for constructed lorries

1 files changed, 14 insertions, 1 deletions

diff --git a/lorrycontroller/lstroves.py b/lorrycontroller/lstroves.py
index 8c80907..d2ca301 100644
--- a/lorrycontroller/lstroves.py
+++ b/lorrycontroller/lstroves.py
@@ -119,7 +119,7 @@ class TroveRepositoryLister(object):
             lorry = {
                 local_path: {
                     'type': 'git',
-                    'url': 'ssh://git@%s/%s' % (trovehost, remote_path),
+                    'url': self.construct_lorry_url(trove_info, remote_path),
                     'refspecs': [
                         "+refs/heads/*",
                         "+refs/tags/*",
@@ -140,6 +140,19 @@ class TroveRepositoryLister(object):
         for local_path in delete_local_paths:
             statedb.remove_lorry(local_path)
 
+    def construct_lorry_url(self, trove_info, remote_path):
+        vars = dict(trove_info)
+        vars['remote_path'] = remote_path
+
+        patterns = {
+            'ssh':  'ssh://git@{trovehost}/{remote_path}',
+            'https':
+                'https://{username}:{password}@{trovehost}/git/{remote_path}',
+            'http': 'http://{trovehost}/git/{remote_path}',
+            }
+
+        return patterns[trove_info['protocol']].format(**vars)
+
 
 class ForceLsTrove(lorrycontroller.LorryControllerRoute):