Skip to content
Browse files

merge relistan/master

  • Loading branch information...
2 parents 288b797 + 50a4233 commit 9b116184c312eaec17716021453aacd901042315 @mdomsch committed with Jul 14, 2012
Showing with 7 additions and 0 deletions.
  1. +7 −0 S3/Config.py
View
7 S3/Config.py
@@ -88,6 +88,7 @@ class Config(object):
website_endpoint = "http://%(bucket)s.s3-website-%(location)s.amazonaws.com/"
additional_destinations = []
cache_file = ""
+ add_headers = ""
## Creating a singleton
def __new__(self, configfile = None):
@@ -117,6 +118,12 @@ def read_config_file(self, configfile):
cp = ConfigParser(configfile)
for option in self.option_list():
self.update_option(option, cp.get(option))
+
+ if cp.get('add_headers'):
+ for option in cp.get('add_headers').split(","):
+ (key, value) = option.split(':')
+ self.extra_headers[key.replace('_', '-').strip()] = value.strip()
+
self._parsed_files.append(configfile)
def dump_config(self, stream):

0 comments on commit 9b11618

Please sign in to comment.
Something went wrong with that request. Please try again.