Merge branch 'staging'

CaptainFact · Nov 27, 2018 · 4408a9a · 4408a9a
2 parents 3641977 + 5ef590d
commit 4408a9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/index.html b/app/index.html
@@ -60,7 +60,7 @@
         _paq.push(['setTrackerUrl', u+'piwik.php']);
         _paq.push(['setSiteId', '1']);
         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+'js'; s.parentNode.insertBefore(g,s);
+        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'js/'; s.parentNode.insertBefore(g,s);
       })();
     }
   </script>

diff --git a/config/nginx.conf b/config/nginx.conf
@@ -33,7 +33,7 @@ http {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
     add_header Content-Security-Policy "
       default-src 'self';
-      script-src 'self' 'unsafe-inline' https://www.youtube.com https://s.ytimg.com https://stats.captainfact.io https://cdnjs.cloudflare.com 'sha256-Y0GQ8oBo2E9DpNIINLboEYGSH1dyzdm4iSyTkt/qmBU=' 'sha256-eu0HGg3xMVXSmvm6q3hDFPfztFLk0VQdzHzWjxyXGDc=';
+      script-src 'self' 'unsafe-inline' https://www.youtube.com https://s.ytimg.com https://stats.captainfact.io https://cdnjs.cloudflare.com 'sha256-Y0GQ8oBo2E9DpNIINLboEYGSH1dyzdm4iSyTkt/qmBU=' 'sha256-kQJBbA6+P0lReef1s4voWq9FqF74NDZdtVkCAnL7Xoo=';
       style-src 'self' 'unsafe-inline';
       connect-src 'self' HTTP_API_BASE_URL WS_API_BASE_URL GRAPHQL_API_BASE_URL https://query.wikidata.org;
       img-src 'self' STATIC_RESOURCES_URL https://stats.captainfact.io https://api.adorable.io https://img.youtube.com data:;