Default s3 folder to ''

camptocamp · Oct 19, 2012 · 5bc9c84 · 5bc9c84
1 parent 8adf9d0
commit 5bc9c84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tilecloud_chain/__init__.py b/tilecloud_chain/__init__.py
@@ -136,6 +136,7 @@ def __init__(self, config_file, options, layer_name=None):
                 error = self.validate(cache, name, 'folder', attribute_type=str, required=True) or error
             elif cache == 's3':
                 error = self.validate(cache, name, 'bucket', attribute_type=str, required=True) or error
+                error = self.validate(cache, name, 'folder', attribute_type=str, default='') or error
 
         error = self.validate(self.config, 'generation', 'config', attribute_type=dict, default={}) or error
         error = self.validate(self.config['generation'], 'generation', 'default_cache', attribute_type=str) or error

diff --git a/tilecloud_chain/scaffolds/create/tilegeneration/config.yaml.in b/tilecloud_chain/scaffolds/create/tilegeneration/config.yaml.in
@@ -20,7 +20,7 @@ caches:
         # %(bucket)s and %(folder)s comes from this cache
         http_url: https://%(host)s/%(bucket)s/%(folder)s
         bucket: tiles
-        folder: tiles
+        folder:
 
 # this defines some defaults values for all the layers
 layer_default: