use aws id and secret from settings.py

tsloughter · Oct 31, 2012 · 85d9e17 · 85d9e17
1 parent cf36eb2
commit 85d9e17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/disco/comm.py b/lib/disco/comm.py
@@ -130,7 +130,7 @@ def _upload(url):
     return [_upload(s3_url) for s3_url in s3_urls] + list(comm_pycurl.upload(non_s3_urls, source, token, **kwargs))
 
 def s3_put(bucket, key, source):
-    conn = S3Connection()
+    conn = S3Connection(settings['AWS_ACCESS_KEY_ID'], settings['AWS_SECRET_KEY'])
     bucket = conn.create_bucket(bucket)
     k = Key(bucket)
 

diff --git a/lib/disco/schemes/scheme_s3.py b/lib/disco/schemes/scheme_s3.py
@@ -5,9 +5,12 @@
 from boto.s3.key import Key
 
 def open(url):
+    from disco.settings import DiscoSettings
+    settings = DiscoSettings()
+
     key = os.path.basename(url)
     (bucket, dirname) = os.path.split(os.path.dirname(url)[5:])
-    conn = S3Connection()
+    conn = S3Connection(settings['AWS_ACCESS_KEY_ID'], settings['AWS_SECRET_KEY'])
     bucket = conn.create_bucket(bucket)
     k = Key(bucket)
     k.key = os.path.join(dirname, key)