diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-22 13:44:36 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-22 13:44:36 +0200 |
| commit | 42ec62ef51902167feccbdb512a2f1c119e0aa74 (patch) | |
| tree | 35220fade376550793852586c988331f16a8877c | |
| parent | 41068df71d8c198bced9cc16eeb4ed1f70961e86 (diff) | |
| download | gitlab-ce-38168-cdn-support-for-piwik-analytics-platform.tar.gz | |
Added piwik_js_cdn_url so we are able to have piwik.js on our CDN38168-cdn-support-for-piwik-analytics-platform
| -rw-r--r-- | app/views/layouts/_piwik.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/38168-cdn-support-for-piwik-analytics-platform.yml | 5 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/layouts/_piwik.html.haml b/app/views/layouts/_piwik.html.haml index a888e8ae187..2ccb6b17319 100644 --- a/app/views/layouts/_piwik.html.haml +++ b/app/views/layouts/_piwik.html.haml @@ -5,11 +5,10 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { - var u="//#{extra_config.piwik_url}/"; - _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setTrackerUrl', '//#{extra_config.piwik_url}/piwik.php']); _paq.push(['setSiteId', #{extra_config.piwik_site_id}]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + g.type='text/javascript'; g.async=true; g.defer=true; g.src='//#{extra_config.has_key?('piwik_js_cdn_url') ? extra_config.piwik_js_cdn_url : extra_config.piwik_url}/piwik.js'; s.parentNode.insertBefore(g,s); })(); <noscript><p><img src="//#{extra_config.piwik_url}/piwik.php?idsite=#{extra_config.piwik_site_id}" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> diff --git a/changelogs/unreleased/38168-cdn-support-for-piwik-analytics-platform.yml b/changelogs/unreleased/38168-cdn-support-for-piwik-analytics-platform.yml new file mode 100644 index 00000000000..d0bcc59ce62 --- /dev/null +++ b/changelogs/unreleased/38168-cdn-support-for-piwik-analytics-platform.yml @@ -0,0 +1,5 @@ +--- +title: Piwik.js is now CDN compatible through the extra_config parameter piwik_js_cdn_url +merge_request: +author: +type: changed diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 9b496822e93..8d161026d4f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -613,6 +613,7 @@ production: &base ## Piwik analytics. # piwik_url: '_your_piwik_url' + # piwik_js_cdn_url: '_your_piwik_js_cdn_url' # piwik_site_id: '_your_piwik_site_id' rack_attack: |