This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-site.git
The following commit(s) were added to refs/heads/main by this push:
new 6f6c3d7 SOLR-15275 Remove Google Analytics from site
new 9856030 Merge pull request #31 from cominvent/solr15275-remove-GA
6f6c3d7 is described below
commit 6f6c3d7c6c23abb1894d68eb1b1d9548170bb387
Author: Jan Høydahl <[email protected]>
AuthorDate: Thu Aug 12 10:49:31 2021 +0200
SOLR-15275 Remove Google Analytics from site
---
content/pages/privacy.md | 17 ++---------------
pelicanconf.py | 2 +-
themes/solr/templates/_analytics.html | 11 -----------
themes/solr/templates/base.html | 1 -
themes/solr/templates/operator/base.html | 1 -
5 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/content/pages/privacy.md b/content/pages/privacy.md
index a168eaf..92893e8 100644
--- a/content/pages/privacy.md
+++ b/content/pages/privacy.md
@@ -5,18 +5,5 @@ template: page
# Privacy Policy for Apache Solr website
-Information about your use of this website is collected using server access
logs and a tracking cookie.
-The collected information consists of the following:
-
-* The IP address from which you access the website;
-* The type of browser and operating system you use to access our site;
-* The date and time you access our site;
-* The pages you visit; and
-* The addresses of pages from where you followed a link to our site.
-
-Part of this information is gathered using a tracking cookie set by the
[Google Analytics](http://www.google.com/analytics) service and handled by
Google as described in their [privacy
policy](http://www.google.com/privacy.html). See your browser documentation for
instructions on how to disable the cookie if you prefer not to share this data
with Google.
-
-We use the gathered information to help us make our site more useful to
visitors and to better understand how and when our site is
- used. We do not track or collect personally identifiable information or
associate gathered data with any personally identifying information from other
sources.
-
-By using this website, you consent to the collection of this data in the
manner and for the purpose described above.
+Information about your use of this website is collected using server access
logs, and stored in aggregated and
+anonoymized form for the purpose of usage statistics. We don't use 3rd party
trackers.
diff --git a/pelicanconf.py b/pelicanconf.py
index 9e6e492..ef06309 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -78,7 +78,7 @@ LINKS = (('Pelican', 'http://getpelican.com/'),
SOCIAL = (('You can add links in your config file', '#'),
('Another social link', '#'),)
-GOOGLE_ANALYTICS_TRACKING_ID = 'G-QKSF79B9Y1'
+# GOOGLE_ANALYTICS_TRACKING_ID = 'G-QKSF79B9Y1'
DEFAULT_PAGINATION = False
diff --git a/themes/solr/templates/_analytics.html
b/themes/solr/templates/_analytics.html
deleted file mode 100644
index 18cf2ff..0000000
--- a/themes/solr/templates/_analytics.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{
GOOGLE_ANALYTICS_TRACKING_ID }}"></script>
-<script>
- window.dataLayer = window.dataLayer || [];
- function gtag(){dataLayer.push(arguments);}
- gtag('js', new Date());
-
- gtag('config', '{{ GOOGLE_ANALYTICS_TRACKING_ID }}');
-</script>
-<!-- End Google Analytics -->
-
diff --git a/themes/solr/templates/base.html b/themes/solr/templates/base.html
index 3db8e3b..446d5a2 100644
--- a/themes/solr/templates/base.html
+++ b/themes/solr/templates/base.html
@@ -43,7 +43,6 @@
</footer>
{% include "_last_scripts.html" %}
- {% include "_analytics.html" %}
{% include "_modal_welcomebox.html" %}
</body>
</html>
diff --git a/themes/solr/templates/operator/base.html
b/themes/solr/templates/operator/base.html
index 5437def..8356c98 100644
--- a/themes/solr/templates/operator/base.html
+++ b/themes/solr/templates/operator/base.html
@@ -44,6 +44,5 @@
</footer>
{% include "_last_scripts.html" %}
- {% include "_analytics.html" %}
</body>
</html>
