Merge branch 'hotfix/domain-protocol'

okfn · May 2, 2017 · 3604176 · 3604176
2 parents 98a358d + f02098f
commit 3604176
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/census/views/includes/share_buttons.html b/census/views/includes/share_buttons.html
@@ -26,7 +26,7 @@ <h4 class="modal-title" id="embedLabel">{{ gettext("Map embed code") }}</h4>
       </div>
       <div class="modal-body">
         <p>{{ gettext("Use the following code to embed the map visualisation into your own website.") }}</p>
-        <pre contenteditable="true">&lt;iframe width="100%" height="360px" src="http://index.okfn.org/vis/map/embed/?embed_width=100%&embed_height=360px&filter_year=2015&filter_dataset=statistics&panel_tools=false&panel_share=false&embed_title=National Statistics ; 2015&map_place=" frameBorder="0"&gt;&lt;/iframe&gt;</pre>
+        <pre contenteditable="true">&lt;iframe width="100%" height="360px" src="https://index.okfn.org/vis/map/embed/?embed_width=100%&embed_height=360px&filter_year=2015&filter_dataset=statistics&panel_tools=false&panel_share=false&embed_title=National Statistics ; 2015&map_place=" frameBorder="0"&gt;&lt;/iframe&gt;</pre>
         <p>{{ gettext("If you are a developer, you can read more about the embed options here:") }}
           <a href="https://github.com/okfn/opendataindex/#choropleth-map" title="{{ gettext("Embed options") }}">
           {{ gettext("Embed options") }}

diff --git a/index/generate.js b/index/generate.js
@@ -170,10 +170,11 @@ const domain = options.site;
 const year = options.year;
 const bucketSite = (isGodi) ? '' : `${domain}-`;
 const bucketName = `${bucketSite}index${indexDomainSuffix}.okfn.org`;
-let baseUrl = `http://${bucketName}`;
+let baseUrl = `https://${bucketName}`;
 // Add INDEX_STAGING_DOMAIN, if it exists.
 if (process.env.INDEX_STAGING_DOMAIN) {
   baseUrl = `${baseUrl}.${process.env.INDEX_STAGING_DOMAIN}`;
+  baseUrl = baseUrl.replace('https://', 'http://');
 }
 if (process.env.INDEX_DOMAIN_SUFFIX === 'dev') {
   baseUrl = 'http://localhost:8000';