diff --git a/composer.json b/composer.json index 85d196e..2838552 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "drupal/core-composer-scaffold": "^8.8", "drupal/core-recommended": "^8.8", "drupal/discoverable_entity_bundle_classes": "^1.0", + "drupal/fathom_analytics": "^2.1", "drupal/google_analytics": "^2.4", "drupal/honeypot": "^2.0", "drupal/hook_event_dispatcher": "^1.28", diff --git a/composer.lock b/composer.lock index 97b1446..982bbbd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7bbccfb120dff2061b0ee08236ae99b3", + "content-hash": "420b3eb8a3e6c4aebb7db61ec3a60a1e", "packages": [ { "name": "asm89/stack-cors", @@ -2434,6 +2434,54 @@ "source": "https://git.drupalcode.org/project/entity_reference_revisions" } }, + { + "name": "drupal/fathom_analytics", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/fathom_analytics.git", + "reference": "8.x-2.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/fathom_analytics-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "837815f47ef2ac54efa066beb1c7629440cdd6e5" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.1", + "datestamp": "1589823042", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Tina Mrak", + "homepage": "https://www.drupal.org/u/tinamrak" + } + ], + "description": "Track your site with Fathom - a simple, privacy-focused website analytics platform.", + "homepage": "https://www.drupal.org/project/fathom_analytics", + "keywords": [ + "Drupal" + ], + "support": { + "source": "http://cgit.drupalcode.org/fathom_analytics", + "issues": "http://drupal.org/project/issues/fathom_analytics" + } + }, { "name": "drupal/google_analytics", "version": "2.4.0", @@ -2802,12 +2850,9 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { "version": "8.x-1.12", - "datestamp": "1585646341", + "datestamp": "1586025529", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3056,9 +3101,6 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { "version": "8.x-1.11", "datestamp": "1581850829", @@ -3191,9 +3233,6 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { "version": "8.x-1.5", "datestamp": "1576656784", @@ -3304,15 +3343,12 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { "version": "8.x-1.0-rc1", "datestamp": "1581495847", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "RC releases are not covered by Drupal security advisories." } } }, diff --git a/config/default/config_split.config_split.live.yml b/config/default/config_split.config_split.live.yml index 9856d89..c93437b 100644 --- a/config/default/config_split.config_split.live.yml +++ b/config/default/config_split.config_split.live.yml @@ -6,10 +6,11 @@ id: live label: Live description: '' folder: ../config/splits/live -module: { } +module: + fathom_analytics: 0 theme: { } blacklist: - - google_analytics.settings + - fathom_analytics.settings graylist: - system.site graylist_dependents: true diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 30d1d26..b91cee7 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -17,11 +17,11 @@ module: discoverable_entity_bundle_classes: 0 dynamic_page_cache: 0 entity_reference_revisions: 0 + fathom_analytics: 0 field: 0 field_ui: 0 file: 0 filter: 0 - google_analytics: 0 honeypot: 0 hook_event_dispatcher: 0 image: 0 diff --git a/config/splits/live/fathom_analytics.settings.yml b/config/splits/live/fathom_analytics.settings.yml new file mode 100644 index 0000000..0a2599a --- /dev/null +++ b/config/splits/live/fathom_analytics.settings.yml @@ -0,0 +1,11 @@ +site_id: '' +custom_domain: analytics.odwd.co.uk +tracking: + path_mode: '0' + path_pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" + role_mode: '0' + role_roles: + anonymous: anonymous + authenticated: 0 +_core: + default_config_hash: ie9NKhxRjQce5sQnPj76jiUpy1zEx-ndS1d_Iq1UR_4 diff --git a/config/splits/live/google_analytics.settings.yml b/config/splits/live/google_analytics.settings.yml deleted file mode 100644 index ceac67b..0000000 --- a/config/splits/live/google_analytics.settings.yml +++ /dev/null @@ -1,38 +0,0 @@ -account: UA-11967257-1 -premium: false -domain_mode: 0 -cross_domains: '' -visibility: - request_path_mode: 0 - request_path_pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" - user_role_mode: 0 - user_role_roles: - anonymous: anonymous - user_account_mode: 0 -track: - outbound: true - mailto: true - files: true - files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip' - colorbox: true - linkid: false - urlfragments: false - userid: false - messages: { } - site_search: false - adsense: false - displayfeatures: false -privacy: - anonymizeip: true -custom: - dimension: { } - metric: { } -codesnippet: - create: { } - before: '' - after: '' -translation_set: false -cache: false -debug: false -_core: - default_config_hash: SMk3vOyh4KT6rXnqkDcNQ51YGpJzRV5hyig5SSIfU6U