Merge pull request #102 from jpmckinney/master

Add FileStore configuration settings to deployment.ini_tmpl

ckan/config/deployment.ini_tmpl

@@ -196,6 +196,34 @@ ckan.feeds.author_name =
 # If not set, then the value in `ckan.site_url` is used.
 ckan.feeds.author_link =
 
+## File Store
+#
+# CKAN allows users to upload files directly to file storage either on the local
+# file system or to online ‘cloud’ storage like Amazon S3 or Google Storage.
+#
+# If you are using local file storage, remember to set ckan.site_url.
+#
+# To enable cloud storage (Google or S3), first run: pip install boto
+#
+# @see http://docs.ckan.org/en/latest/filestore.html
+
+# 'Bucket' to use for file storage
+#ckan.storage.bucket = my-bucket-name
+
+# To enable local file storage:
+#ofs.impl = pairtree
+#ofs.storage_dir = /my/path/to/storage/root/directory
+
+# To enable Google cloud storage:
+#ofs.impl = google
+#ofs.gs_access_key_id =
+#ofs.gs_secret_access_key =
+
+# To enable S3 cloud storage:
+#ofs.impl = s3
+#ofs.aws_access_key_id = ....
+#ofs.aws_secret_access_key = ....
+
 ## Webstore
 ## Uncommment to enable datastore
 # ckan.datastore.enabled = 1

doc/filestore.rst

@@ -36,6 +36,9 @@ after the ``[app:main]`` line::
    # directory on disk for data storage (should be empty)
    ofs.storage_dir = /my/path/to/storage/root/directory
 
+You must also set ``ckan.site_url`` to your CKAN instance's base URL, e.g.
+``http://scotdata.ckan.net``.
+
 Cloud Storage
 -------------