summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Styk <mastyk@redhat.com>2018-12-19 15:05:02 +0100
committerMartin Styk <mastyk@redhat.com>2019-01-03 06:31:53 +0000
commitd72e9a28d80ba9169d2ad5acbd589dc34de611d1 (patch)
tree3008661a3280d13140cc49d82a04457b122927bb
parenta56ff5d81d495f439a2a2abdb3f5d1a50e87aef6 (diff)
web ui: Removed Piwik
-rw-r--r--Server/bkr/server/templates/master.kid30
-rw-r--r--Server/server.cfg7
2 files changed, 0 insertions, 37 deletions
diff --git a/Server/bkr/server/templates/master.kid b/Server/bkr/server/templates/master.kid
index 6c68a73..2137e5c 100644
--- a/Server/bkr/server/templates/master.kid
+++ b/Server/bkr/server/templates/master.kid
@@ -190,36 +190,6 @@ from bkr.server.reports import Reports
<p><a href="https://beaker-project.org/">Beaker</a> ${tg.beaker_version()}</p>
</footer>
-<span py:if="tg.config('piwik.base_url') and tg.config('piwik.site_id')" py:strip="True">
-<!--! This is a modified version of the Piwik tracking code that uses DOM
- manipulation instead of document.write to inject the Piwik <script/>.
- This lets the document.ready event fire without waiting for Piwik to be
- loaded (in case the Piwik server is nonresponsive).
-
- The basic technique is described here:
- http://www.nczonline.net/blog/2009/06/23/loading-javascript-without-blocking/
- but we can use jQuery.getScript() to do all the hard work for us.
- -->
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https:${tg.config('piwik.base_url')}" : "http:${tg.config('piwik.base_url')}");
-jQuery.ajax({
- url: pkBaseURL + 'piwik.js',
- dataType: 'script',
- cache: true, // prevent jQuery appending a stupid timestamp parameter
- success: function () {
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", ${tg.config('piwik.site_id')});
-piwikTracker.setCustomVariable(1, 'beaker_user', '${tg.identity.user}');
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
- }
-});
-</script><noscript><p><img src="${tg.config('piwik.base_url')}piwik.php?idsite=${tg.config('piwik.site_id')}" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
-</span>
-
<div py:for="js in tg_js_bodybottom" py:replace="js.display()" />
</body>
diff --git a/Server/server.cfg b/Server/server.cfg
index 590da51..fae6bbd 100644
--- a/Server/server.cfg
+++ b/Server/server.cfg
@@ -102,13 +102,6 @@ sqlalchemy.pool_recycle = 3600
# default no message is shown.
#beaker.reservation_policy_url = "http://example.com/reservation-policy"
-# If both of these options are set, the Piwik tracking javascript snippet will
-# be embedded in all pages, reporting statistics back to the given Piwik
-# installation.
-# Make sure that piwik.base_url is a protocol-relative URL starting with //
-#piwik.base_url = "//analytics.example.invalid/piwik/"
-#piwik.site_id = 123
-
# These install options are used as global defaults for every provision. They
# can be overriden by options on the distro tree, the system, or the recipe.
#beaker.ks_meta = ""