Skip to content

Commit

Permalink
[#1446] Better defaults for DataPusher config options + docs
Browse files Browse the repository at this point in the history
  • Loading branch information
amercader committed Jan 24, 2014
1 parent c9e1bb9 commit bd6e78a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ckan/config/deployment.ini_tmpl
Expand Up @@ -130,8 +130,8 @@ ckan.feeds.author_link =

# Make sure you have set up the DataStore

ckan.datapusher.formats = csv
ckan.datapusher.url = http://datapusher.ckan.org/
#ckan.datapusher.formats =
#ckan.datapusher.url = http://127.0.0.1:8800/

## Activity Streams Settings

Expand Down
18 changes: 14 additions & 4 deletions doc/configuration.rst
Expand Up @@ -1066,19 +1066,29 @@ ckan.datapusher.formats
^^^^^^^^^^^^^^^^^^^^^^^

Example::
ckan.datapusher.formats = csv xls xlsx

.. todo:: Expand
ckan.datapusher.formats = csv xls

Default value: ``csv xls application/csv application/vnd.ms-excel``

File formats that will be pushed to the DataStore by the DataPusher. When
adding or editing a resource which links to a file in one of these formats,
the DataPusher will automatically try to import its contents to the DataStore.


.. _ckan.datapusher.url:

ckan.datapusher.url
^^^^^^^^^^^^^^^^^^^

Example::
ckan.datapusher.url = http://datapusher.ckan.org/

.. todo:: Expand
ckan.datapusher.url = http://127.0.0.1:8800/

DataPusher endpoint to use when enabling the ``datapusher`` extension. If you
installed CKAN via :doc:`install-from-package`, the DataPusher was installed for you
running on port 8800. If you want to manually install the DataPusher, follow
the installation `instructions <http://docs.ckan.org/projects/datapusher>`_.


Activity Streams Settings
Expand Down

0 comments on commit bd6e78a

Please sign in to comment.