From c9c8af0ce8571e566c8596e18eae7a17ca14a259 Mon Sep 17 00:00:00 2001
From: cgswap <baffolobill@yandex.ru>
Date: Tue, 1 Apr 2014 23:05:50 +0400
Subject: [PATCH] fixes bug related with using CONTAINER_URI and
 STATIC_CONTAINER

---
 cumulus/settings.py |  2 ++
 cumulus/storage.py  | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cumulus/settings.py b/cumulus/settings.py
index 4fe68c9..be072cf 100644
--- a/cumulus/settings.py
+++ b/cumulus/settings.py
@@ -20,6 +20,8 @@
     "USE_SSL": False,
     "USERNAME": None,
     "STATIC_CONTAINER": None,
+    "STATIC_CONTAINER_URI": None,
+    "STATIC_CONTAINER_SSL_URI": None,
     "INCLUDE_LIST": [],
     "EXCLUDE_LIST": [],
     "HEADERS": {},
diff --git a/cumulus/storage.py b/cumulus/storage.py
index 92f7c3c..505113b 100644
--- a/cumulus/storage.py
+++ b/cumulus/storage.py
@@ -58,6 +58,8 @@ class SwiftclientStorage(Storage):
     region = CUMULUS["REGION"]
     connection_kwargs = {}
     container_name = CUMULUS["CONTAINER"]
+    container_uri = CUMULUS["CONTAINER_URI"]
+    container_ssl_uri = CUMULUS["CONTAINER_SSL_URI"]
     use_snet = CUMULUS["SERVICENET"]
     username = CUMULUS["USERNAME"]
     ttl = CUMULUS["TTL"]
@@ -148,12 +150,12 @@ def _set_container(self, container):
     container = property(_get_container, _set_container)
 
     def _get_container_url(self):
-        if self.use_ssl and CUMULUS["CONTAINER_SSL_URI"]:
-            self._container_public_uri = CUMULUS["CONTAINER_SSL_URI"]
+        if self.use_ssl and self.container_ssl_uri:
+            self._container_public_uri = self.container_ssl_uri
         elif self.use_ssl:
             self._container_public_uri = self.container.cdn_ssl_uri
-        elif CUMULUS["CONTAINER_URI"]:
-            self._container_public_uri = CUMULUS["CONTAINER_URI"]
+        elif self.container_uri:
+            self._container_public_uri = self.container_uri
         else:
             self._container_public_uri = self.container.cdn_uri
         if CUMULUS["CNAMES"] and self._container_public_uri in CUMULUS["CNAMES"]:
@@ -313,6 +315,8 @@ class SwiftclientStaticStorage(SwiftclientStorage):
     STATICFILES_STORAGE = "cumulus.storage.SwiftclientStaticStorage".
     """
     container_name = CUMULUS["STATIC_CONTAINER"]
+    container_uri = CUMULUS["STATIC_CONTAINER_URI"]
+    container_ssl_uri = CUMULUS["STATIC_CONTAINER_SSL_URI"]
 
 
 class SwiftclientStorageFile(File):