From 99b4bfb8abbec47fba2a1536bb49517534da5283 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 24 Jul 2017 18:34:01 +0200 Subject: [PATCH] New tasks for the OAI-PMH plugin. --- ckan/ckan/defaults/main.yml | 3 ++- ckan/ckan/tasks/ckan-plugins.yml | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ckan/ckan/defaults/main.yml b/ckan/ckan/defaults/main.yml index d45d6441..09418334 100644 --- a/ckan/ckan/defaults/main.yml +++ b/ckan/ckan/defaults/main.yml @@ -77,7 +77,8 @@ ckan_ckanext_lire_url: 'https://github.com/milicp/ckanext-lire.git' # OAI-PMH ckan_oai_pmh: False ckan_oai_pmh_name: oaipmh -ckan_oai_pmh_url: 'https://github.com/kata-csc/ckanext-oaipmh.git' +ckan_oai_pmh_state: absent +ckan_oai_pmh_url: 'git+https://github.com/florenthemmi/ckanext-oaipmh#egg=ckanext-oaipm' # Google analytics ckan_google_analytics: False ckan_google_analytics_name: googleanalytics diff --git a/ckan/ckan/tasks/ckan-plugins.yml b/ckan/ckan/tasks/ckan-plugins.yml index 0a93c00d..ba94ac78 100644 --- a/ckan/ckan/tasks/ckan-plugins.yml +++ b/ckan/ckan/tasks/ckan-plugins.yml @@ -144,17 +144,11 @@ tags: [ 'ckan', 'ckan_lire', 'ckan_plugins' ] - name: Download the CKAN OAI-PMH plugin - git: repo={{ ckan_oai_pmh_url }} dest=/usr/lib/ckan/default/src/ckanext-oaipmh force=yes update={{ ckan_git_plugins_state }} + pip: name='{{ ckan_oai_pmh_url }}' virtualenv={{ ckan_virtenv }} state={{ ckan_plugins_state }} when: ckan_oai_pmh - register: install_ckan_oai_pmh + notify: Restart CKAN tags: [ 'ckan', 'ckan_oai_pmh', 'ckan_plugins' ] - - name: Setup the CKAN OAI-PMH plugin - shell: . /usr/lib/ckan/default/bin/activate ; cd /usr/lib/ckan/default/src/ckanext-oaipmh ; python setup.py develop - when: ( install_ckan_oai_pmh | changed ) - notify: Restart CKAN - tags: [ 'ckan', 'ckan_oai_pmh', 'ckan_plugins' ] - - name: Download the CKAN google analytics plugin python requirements pip: name='genshi' virtualenv={{ ckan_virtenv }} state={{ ckan_plugins_state }} when: ckan_google_analytics