From 54d6a92deac9601e44436be9e7bd7ee2cfcd88f4 Mon Sep 17 00:00:00 2001 From: Michael Maurizi Date: Wed, 19 Sep 2018 14:56:03 -0400 Subject: [PATCH] Remove Google Analytics CKAN extension Some context: opendataphilly.org is currently being tracked using two different Google Analytics account. One account is configured as a snippet on the OpenDataPhilly theme using Google Tag Manager using an account controlled by the City: https://github.com/azavea/ckanext-odp_theme/blob/daaedb9e1248f89129f8af0e4ee109f06945bdff/ckanext/odp_theme/templates/header.html#L5-L13 The other account was under our control and used the `ckanext-googleanalytics` plugin. This plugin provides some additional niceties over what the snippet is doing, like tracking API usage, but these weren't actually being looked at. I considered attempting to consolidate the two approaches, but they are both tracking page views leading to double-counting of page views, and there was not an easy way to prevent this. Closes #163 --- deployment/ansible/app.yml | 1 - deployment/ansible/group_vars/staging.example | 1 - deployment/ansible/group_vars/vagrant.example | 1 - .../ckanext-googleanalytics/defaults/main.yml | 2 -- .../roles/ckanext-googleanalytics/meta/main.yml | 5 ----- .../roles/ckanext-googleanalytics/tasks/main.yml | 14 -------------- deployment/ansible/staging.yml | 1 - 7 files changed, 25 deletions(-) delete mode 100644 deployment/ansible/roles/ckanext-googleanalytics/defaults/main.yml delete mode 100644 deployment/ansible/roles/ckanext-googleanalytics/meta/main.yml delete mode 100644 deployment/ansible/roles/ckanext-googleanalytics/tasks/main.yml diff --git a/deployment/ansible/app.yml b/deployment/ansible/app.yml index 7b5e14d..21a5b68 100644 --- a/deployment/ansible/app.yml +++ b/deployment/ansible/app.yml @@ -12,5 +12,4 @@ - { role: "ckanext-geoview" } - { role: "ckanext-datajson" } - { role: "ckanext-odp_theme" } - # - { role: "ckanext-googleanalytics" } - { role: "ckan-odp-configuration" } diff --git a/deployment/ansible/group_vars/staging.example b/deployment/ansible/group_vars/staging.example index 4a19b52..7ae9540 100644 --- a/deployment/ansible/group_vars/staging.example +++ b/deployment/ansible/group_vars/staging.example @@ -9,7 +9,6 @@ ckan_site_url: http://localhost:80/ #db_backup_s3_access_key: #db_backup_s3_secret_key: #db_backup_s3_bucket: -#googleanalytics_id: "" #ckan_ssl_key: "odp.key" #ckan_ssl_cert: "odp.crt" #letsencrypt_domains: [ 'domain.com', 'www.domain.com' ] diff --git a/deployment/ansible/group_vars/vagrant.example b/deployment/ansible/group_vars/vagrant.example index 0ba09a9..7fdf29b 100644 --- a/deployment/ansible/group_vars/vagrant.example +++ b/deployment/ansible/group_vars/vagrant.example @@ -23,4 +23,3 @@ postgresql_hba_mapping: #db_backup_s3_access_key: #db_backup_s3_secret_key: #db_backup_s3_bucket: -#googleanalytics_id: "" diff --git a/deployment/ansible/roles/ckanext-googleanalytics/defaults/main.yml b/deployment/ansible/roles/ckanext-googleanalytics/defaults/main.yml deleted file mode 100644 index 1fe5dd7..0000000 --- a/deployment/ansible/roles/ckanext-googleanalytics/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ckanext_googleanalytics_version: "0febe11dc512978e610fffd7895b5a040e4ab197" diff --git a/deployment/ansible/roles/ckanext-googleanalytics/meta/main.yml b/deployment/ansible/roles/ckanext-googleanalytics/meta/main.yml deleted file mode 100644 index 87354a3..0000000 --- a/deployment/ansible/roles/ckanext-googleanalytics/meta/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -dependencies: - - { role: "ckan.app" } - - { role: "azavea.virtualenv" } - - { role: "azavea.python" } diff --git a/deployment/ansible/roles/ckanext-googleanalytics/tasks/main.yml b/deployment/ansible/roles/ckanext-googleanalytics/tasks/main.yml deleted file mode 100644 index 8c9bad0..0000000 --- a/deployment/ansible/roles/ckanext-googleanalytics/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Using the ansible pip module here results in breakage -- name: Install ckanext-googleanalytics into ckan virtualenv - command: "{{ ckan_virtualenv_path }}/bin/pip install -e git+https://github.com/ckan/ckanext-googleanalytics.git@{{ ckanext_googleanalytics_version }}#egg=ckanext-googleanalytics" - -- name: Add self to CKAN plugin list - lineinfile: dest="{{ ckan_config_path }}" regexp="^ckan.plugins(((?!googleanalytics).)*)$" line="ckan.plugins\1 googleanalytics" backrefs=yes - notify: Restart Apache - when: googleanalytics_id is defined - -- name: Add Google Analytics configuration - lineinfile: dest="{{ ckan_config_path }}" regexp="googleanalytics\.id" line="googleanalytics.id = {{ googleanalytics_id }}" insertafter="ckan\.plugins" - notify: Restart Apache - when: googleanalytics_id is defined and googleanalytics_id != '' diff --git a/deployment/ansible/staging.yml b/deployment/ansible/staging.yml index 81f5c12..5dc0020 100644 --- a/deployment/ansible/staging.yml +++ b/deployment/ansible/staging.yml @@ -12,5 +12,4 @@ - { role: "ckanext-geoview" } - { role: "ckanext-datajson" } - { role: "ckanext-odp_theme" } - - { role: "ckanext-googleanalytics" } - { role: "ckan-odp-configuration" }