Return a webdavs:// url instead of https:// using

setConnectionUrl method.

Return a webdavs:// url instead of https:// using
setConnectionUrl method.
e6d705cb · Antoine Catton · Cédric de Saint Martin · 299f8da0 · e6d705cb
Commit e6d705cb authored Sep 27, 2011 by Antoine Catton Committed by Cédric de Saint Martin Oct 13, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

slapos/recipe/davstorage/__init__.py slapos/recipe/davstorage/__init__.py +6 -7

No files found.
--- a/slapos/recipe/davstorage/__init__.py
+++ b/slapos/recipe/davstorage/__init__.py
@@ -41,13 +41,12 @@ class Recipe(BaseSlapRecipe):
    self.path_list = []
    self.requirements, self.ws = self.egg.working_set()
    document_root = self.createDataDirectory('www')
-    self.apache_config = self.installApache(document_root)
+    apache_config = self.installApache(document_root)
-    self.setConnectionDict(
+    self.setConnectionUrl(scheme='webdavs',
-      dict(url='https://[%s]:%s/' % (self.apache_config['ip'],
+                          host=apache_config['ip'],
-                                     self.apache_config['port']),
+                          port=apache_config['port'],
-           user=self.apache_config['user'],
+                          auth=(apache_config['user'],
-           password=self.apache_config['password']),
+                                apache_config['password']))
-    )
    return self.path_list
  def installApache(self, document_root, ip=None, port=None):