From 5390cbf4741fc4bec5f834759e09fd89456bc573 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Fri, 21 May 2021 14:01:40 +0200
Subject: [PATCH] [org] Update HTML headers

Change the keyword used from `html_head_extra' to `html_head', since
they are both strictly equivalent to one another.

Update Matomo script in order to better respect RGPD requirements and
related French laws.
---
 org/config/headers | 54 ++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/org/config/headers b/org/config/headers
index 0967cf4..195cc87 100644
--- a/org/config/headers
+++ b/org/config/headers
@@ -13,29 +13,37 @@
 # ### HTML #####################################################################
 
 #+HTML_DOCTYPE: html5
-#+HTML_HEAD_EXTRA: <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" />
-#+HTML_HEAD_EXTRA: <meta name="twitter:card" content="summary" />
-#+HTML_HEAD_EXTRA: <meta name="twitter:site" content="@phundrak" />
-#+HTML_HEAD_EXTRA: <meta name="twitter:creator" content="@phundrak" />
-#+HTML_HEAD_EXTRA: <link rel="stylesheet" href="/style/main.css"/>
-#+HTML_HEAD_EXTRA: <link rel="shortcut icon" href="https://cdn.phundrak.com/img/mahakala-128x128.png" type="img/png" media="screen" />
-#+HTML_HEAD_EXTRA: <link rel="shortcut icon" href="https://cdn.phundrak.com/img/favicon.ico" type="image/x-icon" media="screen" />
-#+HTML_HEAD_EXTRA: <script defer src="/dart/main.dart.js"></script>
-#+html_head_extra: <!-- Matomo -->
-#+html_head_extra: <script type="text/javascript">
-#+html_head_extra:  var _paq = window._paq || [];
-#+html_head_extra:  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-#+html_head_extra:  _paq.push(['trackPageView']);
-#+html_head_extra:  _paq.push(['enableLinkTracking']);
-#+html_head_extra:  (function() {
-#+html_head_extra:      var u="//matomo.phundrak.com/";
-#+html_head_extra:      _paq.push(['setTrackerUrl', u+'matomo.php']);
-#+html_head_extra:      _paq.push(['setSiteId', '3']);
-#+html_head_extra:      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-#+html_head_extra:      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-#+html_head_extra:  })();
-#+html_head_extra: </script>
-#+html_head_extra: <!-- End Matomo Code -->
+#+HTML_HEAD: <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" />
+#+HTML_HEAD: <meta name="twitter:card" content="summary" />
+#+HTML_HEAD: <meta name="twitter:site" content="@phundrak" />
+#+HTML_HEAD: <meta name="twitter:creator" content="@phundrak" />
+#+HTML_HEAD: <link rel="stylesheet" href="/style/main.css"/>
+#+HTML_HEAD: <link rel="shortcut icon" href="https://cdn.phundrak.com/img/mahakala-128x128.png" type="img/png" media="screen" />
+#+HTML_HEAD: <link rel="shortcut icon" href="https://cdn.phundrak.com/img/favicon.ico" type="image/x-icon" media="screen" />
+#+HTML_HEAD: <script defer src="/dart/main.dart.js"></script>
+#+html_head: <!-- Matomo -->
+#+html_head: <script type="text/javascript">
+#+html_head:   var _paq = window._paq = window._paq || [];
+#+html_head:   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+#+html_head:  _paq.push(['requireConsent']);
+#+html_head:  _paq.push(['trackPageview']);
+#+html_head:  _paq.push(['setConsentGiven']);
+#+html_head:  _paq.push(['rememberConsentGiven'])
+#+html_head:   _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+#+html_head:   _paq.push(["setCookieDomain", "*.phundrak.com"]);
+#+html_head:   _paq.push(["setDomains", ["*.phundrak.com","*.blog.phundrak.com","*.config.phundrak.com","*.langue.phundrak.com"]]);
+#+html_head:   _paq.push(["setDoNotTrack", true]);
+#+html_head:   _paq.push(['trackPageView']);
+#+html_head:   _paq.push(['enableLinkTracking']);
+#+html_head:   (function() {
+#+html_head:     var u="//matomo.phundrak.com/";
+#+html_head:     _paq.push(['setTrackerUrl', u+'matomo.php']);
+#+html_head:     _paq.push(['setSiteId', '3']);
+#+html_head:     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+#+html_head:     g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+#+html_head:   })();
+#+html_head: </script>
+#+html_head: <!-- End Matomo Code -->
 
 # ### MACROS ###################################################################
 #+MACRO: newline @@latex:\hspace{0pt}\\@@ @@html:<br>@@