This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git
The following commit(s) were added to refs/heads/master by this push:
new fbc5728 TOMEE-3851 - Replaces Google Analytics with ASF Matomo
Instance
fbc5728 is described below
commit fbc57285051a3a7b080784ce8879297f71af4fe7
Author: Richard Zowalla <[email protected]>
AuthorDate: Mon Mar 14 08:22:59 2022 +0100
TOMEE-3851 - Replaces Google Analytics with ASF Matomo Instance
---
src/main/jbake/content/privacy-policy.adoc | 40 ++++++++++++++++++++++--------
src/main/jbake/templates/header.gsp | 29 +++++++++++++---------
2 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/src/main/jbake/content/privacy-policy.adoc
b/src/main/jbake/content/privacy-policy.adoc
index ea976a4..f41d3e0 100644
--- a/src/main/jbake/content/privacy-policy.adoc
+++ b/src/main/jbake/content/privacy-policy.adoc
@@ -9,20 +9,40 @@
link:https://privacy.apache.org/policies/privacy-policy-public.html[].
== Additional Terms
-Privacy Policy Information about your use of this website is collected using
server access logs and a tracking cookie.
+*Collection and storage of personal data and the nature and purpose of their
use when visiting the website*
+
+Information about your use of this website is collected using server access
logs.
+We do this to understand what parts of the website are important to our users,
what features are most frequently read up on, where users get lost in the
documentation, etc.
+This data allows us to better understand how users use the system, the
website, and the docs and where to focus improvements next.
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.
+* 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;
+* If you click on any of the file download links on our website;
+* The addresses of pages from where you followed a link to our site;
+* The addresses of pages to where you go to from our site; and
+* The search terms you use on the website.
-Part of this information is gathered using a tracking cookie set by the
link:https://www.google.com/analytics/[Google Analytics] service and handled
by Google as described in their
link:https://www.google.com/privacy.html[privacy policy] . See your browser
documentation for instructions on how to disable the cookie if you prefer not
to share this data with Google.
+This information is gathered and stored using the open source software Matomo.
+We don’t use any cookies to collect this information.
+An IP address is anonymized by removing the last two octets from the IP
address.
+That means that if you’re IP is 192.168.100.50, we store it as 192.168.0.0.
-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.
+Matomo is self-hosted on a virtual machine, provided by the Apache Software
Foundation.
+It can only be accessed by members of the Apache Privacy committee.
+The data can be viewed by anyone by visiting
https://matomo.privacy.apache.org/.
+
+Matomo respects any **Do Not Track** setting in your browser.
+You can also opt-out from all Matomo tracking below.
+
+++++
+<iframe
+style="border: 0; height: 200px; width: 600px;"
+src="https://matomo.privacy.apache.org/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=&fontColor=&fontSize=16px&fontFamily=Roboto";
+></iframe>
+++++
diff --git a/src/main/jbake/templates/header.gsp
b/src/main/jbake/templates/header.gsp
index 2f0d662..e87b756 100755
--- a/src/main/jbake/templates/header.gsp
+++ b/src/main/jbake/templates/header.gsp
@@ -25,18 +25,23 @@
<link rel="stylesheet" type="text/css" href="<%if (content.rootpath)
{%>${content.rootpath}<% } else { %><% }%>css/cardio.css">
<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-2717626-1']);
- _gaq.push(['_setDomainName', 'apache.org']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
- })();
-
+ <!-- Matomo -->
+ var _paq = window._paq = window._paq || [];
+ /* tracker methods like "setCustomDimension" should be called
before "trackPageView" */
+ /* We explicitly disable cookie tracking to avoid privacy
issues */
+ _paq.push(['disableCookies']);
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+ (function () {
+ var u = "//matomo.privacy.apache.org/";
+ _paq.push(['setTrackerUrl', u + 'matomo.php']);
+ _paq.push(['setSiteId', '5']);
+ var d = document, g = d.createElement('script'), s =
d.getElementsByTagName('script')[0];
+ g.async = true;
+ g.src = u + 'matomo.js';
+ s.parentNode.insertBefore(g, s);
+ })();
+ <!-- End Matomo Code -->
</script>
</head>
