Highstock CDN supports HTTPS now, let's use it by default

Teevity · Nov 2, 2015 · 3926e4f · 3926e4f
1 parent 5c76154
commit 3926e4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ Using basic setup, you don't need any extra code change and you will use the pro
           # Specify your currency conversion rate here. The default value is 1. If 1 pound = 1.5 dollar, then the rate is 0.6666667.
           ice.currencyRate=0.6666667
 
-  2.8 By default, Ice pulls in [Highstock](http://www.highcharts.com/) from its CDN. This CDN, unfortunately, does not (at present) support HTTPS. If you're serving Ice over HTTPS, your browser shouldn't or won't download Highstock from there. To fix this, you can serve Highstock somewhere else, and set this property:
+  2.8 By default, Ice pulls in [Highstock](https://www.highcharts.com/) from its CDN.
 
           ice.highstockUrl=https://example.com/js/highstock.js
 

diff --git a/src/java/com/netflix/ice/common/IceOptions.java b/src/java/com/netflix/ice/common/IceOptions.java
@@ -40,8 +40,7 @@ public class IceOptions {
     public static final String CURRENCY_RATE = "ice.currencyRate";
 
     /**
-     * The URL of highstock.js. The default value is the Highcharts CDN; change this if you need to
-     * serve it from somewhere else (for example, if you need HTTPS).
+     * The URL of highstock.js. The default value is the Highcharts CDN (HTTPS)
      */
     public static final String HIGHSTOCK_URL = "ice.highstockUrl";
 

diff --git a/src/java/com/netflix/ice/reader/ReaderConfig.java b/src/java/com/netflix/ice/reader/ReaderConfig.java
@@ -73,7 +73,7 @@ public ReaderConfig(
         companyName = properties.getProperty(IceOptions.COMPANY_NAME, "");
         currencySign = properties.getProperty(IceOptions.CURRENCY_SIGN, "$");
         currencyRate = Double.parseDouble(properties.getProperty(IceOptions.CURRENCY_RATE, "1"));
-        highstockUrl = properties.getProperty(IceOptions.HIGHSTOCK_URL, "http://code.highcharts.com/stock/highstock.js");
+        highstockUrl = properties.getProperty(IceOptions.HIGHSTOCK_URL, "https://code.highcharts.com/stock/highstock.js");
 
         this.managers = managers;
         this.applicationGroupService = applicationGroupService;

diff --git a/src/java/sample.properties b/src/java/sample.properties
@@ -13,8 +13,8 @@ ice.reservationPeriod=threeyear
 # default reservation utilization, possible values are LIGHT, MEDIUM, HEAVY. If you have both (LIGHT or MEDIUM) and HEAVY RIs, make sure you do not put HEAVY here.
 ice.reservationUtilization=MEDIUM
 
-# the highstock url; host it somewhere else and change this if you need HTTPS
-ice.highstockUrl=http://code.highcharts.com/stock/highstock.js
+# the highstock url
+ice.highstockUrl=https://code.highcharts.com/stock/highstock.js
 
 # url prefix, e.g. http://ice.netflix.com/. Will be used in alert emails.
 ice.urlPrefix=