Hump.fm: update configs and scripts

1 files changed, 5 insertions, 3 deletions

diff --git a/scripts/s3upload.py b/scripts/s3upload.py
index f39ea19..f3e7cd5 100755
--- a/scripts/s3upload.py
+++ b/scripts/s3upload.py
@@ -6,13 +6,15 @@ import time
 import S3
 
 CONN = None
-AWS_ACCESS_KEY_ID = 'AKIAIVBEMR22OOG7OMMQ'
-AWS_SECRET_ACCESS_KEY = '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'
-BUCKET_NAME = 'dumpfm'
+AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID')
+AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
+BUCKET_NAME = os.environ.get('HUMPFM_S3_BUCKET', 'humpfm')
 
 def get_or_initialize_aws_connection():
     global CONN
     if not CONN:
+        if not AWS_ACCESS_KEY_ID or not AWS_SECRET_ACCESS_KEY:
+            raise Exception("Missing AWS credentials (AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY)")
         print "Initializing AWS connection with ID %s, bucket %s" % (AWS_ACCESS_KEY_ID,
                                                                      BUCKET_NAME)
         CONN = S3.AWSAuthConnection(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)