]> git.openstreetmap.org Git - chef.git/commitdiff
projects / chef.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 6adfd52)
Load javascript resources over https
authorTom Hughes <tom@compton.nu>
Tue, 14 Feb 2017 19:11:36 +0000 (19:11 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 14 Feb 2017 19:11:36 +0000 (19:11 +0000)
cookbooks/dns/templates/default/zone.html.erb patch | blob | history
cookbooks/imagery/templates/default/index.html.erb patch | blob | history

diff --git a/cookbooks/dns/templates/default/zone.html.erb b/cookbooks/dns/templates/default/zone.html.erb
index 792b65ca0210d415aa055269e310d76adecab7e2..72d4d598d8ec98b27367007e4ce3077dbaef0a37 100644 (file)
--- a/cookbooks/dns/templates/default/zone.html.erb
+++ b/cookbooks/dns/templates/default/zone.html.erb
@@ -4,12 +4,9 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <title>GeoDNS - <%= @zone %></title>
     <link rel="stylesheet" href="dns.css" type="text/css" media="all" />
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <title>GeoDNS - <%= @zone %></title>
     <link rel="stylesheet" href="dns.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.5.1/leaflet.css" />
-    <!--[if lte IE 8]>
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.5.1/leaflet.ie.css" />
-    <![endif]-->
-    <script type="text/javascript" src="http://cdn.leafletjs.com/leaflet-0.5.1/leaflet.js"></script>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css" />
+    <script type="text/javascript" src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
     <script type="text/javascript" src="dns.js"></script>
   </head>
   <body onload="createMap('map', 'json/<%= @zone %>.json')">
     <script type="text/javascript" src="dns.js"></script>
   </head>
   <body onload="createMap('map', 'json/<%= @zone %>.json')">
diff --git a/cookbooks/imagery/templates/default/index.html.erb b/cookbooks/imagery/templates/default/index.html.erb
index a53b27fadcbe99059eafeb71a054a90b4aec5d27..391aefece97b96fdf8407534e9199d698b2942d2 100644 (file)
--- a/cookbooks/imagery/templates/default/index.html.erb
+++ b/cookbooks/imagery/templates/default/index.html.erb
@@ -1,14 +1,11 @@
-<!DOCTYPE html>
+<!DOCTYPE html>lea
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <title><%= @title %></title>
     <link rel="stylesheet" href="imagery.css" type="text/css" media="all" />
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <title><%= @title %></title>
     <link rel="stylesheet" href="imagery.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css" />
-    <!--[if lte IE 8]>
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.ie.css" />
-    <![endif]-->
-    <script type="text/javascript" src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css" />
+    <script type="text/javascript" src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Layer.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Overlay.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Layer.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Overlay.js"></script>
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.