From aa23f1b46c9f3725a1d6e11d909ea52fe35c7d96 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 22 Feb 2018 17:30:28 +0100 Subject: [PATCH] library/roles/ckan/ckan: Fix the google analytics task, for real. --- ckan/ckan/defaults/main.yml | 1 + ckan/ckan/tasks/ckan-plugins.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ckan/ckan/defaults/main.yml b/ckan/ckan/defaults/main.yml index 389ea934..d3360a11 100644 --- a/ckan/ckan/defaults/main.yml +++ b/ckan/ckan/defaults/main.yml @@ -81,6 +81,7 @@ 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_ga_plugin_state: '{{ ckan_plugins_state }}' ckan_google_analytics_name: googleanalytics ckan_google_analytics_url: 'git+https://github.com/ckan/ckanext-googleanalytics.git#egg=ckanext-googleanalytics' ckan_google_analytics_fixed_file: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-catalogue/ckan-d4science-extension/{{ ckan_version }}/ckan-default/plugins/googleanalytics/plugin.py' diff --git a/ckan/ckan/tasks/ckan-plugins.yml b/ckan/ckan/tasks/ckan-plugins.yml index 993ac46b..9ac77ebb 100644 --- a/ckan/ckan/tasks/ckan-plugins.yml +++ b/ckan/ckan/tasks/ckan-plugins.yml @@ -156,7 +156,7 @@ tags: [ 'ckan', 'ckan_google_analytics', 'ckan_plugins' ] - name: Download the CKAN google analytics plugin - pip: name='{{ ckan_google_analytics_url }}' virtualenv={{ ckan_virtenv }} state={{ ckan_plugins_state }} state={{ ckan_ga_plugin_state | default('present') }} + pip: name='{{ ckan_google_analytics_url }}' virtualenv={{ ckan_virtenv }} state={{ ckan_ga_plugin_state }} when: ckan_google_analytics register: install_ckan_google_analytics tags: [ 'ckan', 'ckan_google_analytics', 'ckan_plugins' ]