From c20f78cc692b155031a0a06972b5aeff7b32e4e5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 27 Jan 2017 08:03:00 +0100
Subject: [PATCH] Use https for static webpages where possible

Use https instead of http wherever possible.

Fix a few URLs that are wrong (openstack.org-> www.openstack.org, link
of summit videos).

Change-Id: I6af8649987dd7e45fbad2b0e03a065ea9495af04
---
 www/errorpage.html        |  6 ++--
 www/index.html            | 26 ++++++++---------
 www/templates/css.tmpl    |  4 +--
 www/templates/footer.tmpl | 32 ++++++++++-----------
 www/templates/header.tmpl | 60 +++++++++++++++++++--------------------
 5 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/www/errorpage.html b/www/errorpage.html
index 9d52ab260..161bd8de7 100644
--- a/www/errorpage.html
+++ b/www/errorpage.html
@@ -20,8 +20,8 @@
             <p>The requested URL was not found on this server.</p>
             <p>
             <a href="/">
-                            <img src="http://www.openstack.org/errors_pages/ui/404/images/404.svg"
-                                 onerror="this.onerror=null; this.src=http://www.openstack.org/errors_pages/ui/404/images/404.png" alt="OpenStack 404 Page">
+                            <img src="https://www.openstack.org/errors_pages/ui/404/images/404.svg"
+                                 onerror="this.onerror=null; this.src=https://www.openstack.org/errors_pages/ui/404/images/404.png" alt="OpenStack 404 Page">
                         </a>
             </p>
             <p>Note that this server was set up recently and does not contain any
@@ -39,7 +39,7 @@
                 <a href="https://www.openstack.org/marketplace">Marketplace</a>
                 <a href="https://www.openstack.org/events">Events</a>
                 <a href="https://www.openstack.org/blog">Blog</a>
-                <a href="http://docs.openstack.org">Docs</a>
+                <a href="https://docs.openstack.org">Docs</a>
             </div>
         </div>
     </div>
diff --git a/www/index.html b/www/index.html
index d31e51d76..5fb521df1 100644
--- a/www/index.html
+++ b/www/index.html
@@ -232,7 +232,7 @@
                         Docs and resources
                      </dt>
                      <dd>
-                        <a class="link" href="http://developer.openstack.org/firstapp-libcloud/getting_started.html" target="_top">
+                        <a class="link" href="https://developer.openstack.org/firstapp-libcloud/getting_started.html" target="_top">
                         Getting started
                         </a>
                      </dd>
@@ -305,7 +305,7 @@
                         SDK
                      </dt>
                      <dd>
-                        <a class="roundedButton" href="http://docs.openstack.org/infra/shade/">
+                        <a class="roundedButton" href="https://docs.openstack.org/infra/shade/">
                         Shade SDK
                         </a>
                      </dd>
@@ -317,17 +317,17 @@
                         Docs and resources
                      </dt>
                      <dd>
-                        <a class="link" href="http://developer.openstack.org/firstapp-shade/getting_started.html" target="_top">
+                        <a class="link" href="https://developer.openstack.org/firstapp-shade/getting_started.html" target="_top">
                         Getting started
                         </a>
                      </dd>
                      <dd>
-                        <a class="link" href="http://docs.openstack.org/infra/shade/usage.html" target="_top">
+                        <a class="link" href="https://docs.openstack.org/infra/shade/usage.html" target="_top">
                         Usage
                         </a>
                      </dd>
                      <dd>
-                        <a class="link" href="http://docs.openstack.org/infra/shade/releasenotes.html" target="_top">
+                        <a class="link" href="https://docs.openstack.org/infra/shade/releasenotes.html" target="_top">
                         Release notes
                         </a>
                      </dd>
@@ -619,15 +619,15 @@
             </p>
             <p>
                To learn how to use the APIs, see the <a
-               href="http://developer.openstack.org/api-guide/quick-start/">OpenStack
+               href="https://developer.openstack.org/api-guide/quick-start/">OpenStack
                API Guide</a>.
             </p>
             <h3>Translations</h3>
             <ul>
-              <li><a href="http://developer.openstack.org/id/api-guide/quick-start/">Indonesian (id)</a></li>
-              <li><a href="http://developer.openstack.org/ja/api-guide/quick-start/">Japanese (ja)</a></li>
-              <li><a href="http://developer.openstack.org/ko_KR/api-guide/quick-start/">Korean (ko_KR)</a></li>
-              <li><a href="http://developer.openstack.org/zh_CN/api-guide/quick-start/">Chinese (zh_CN)</a></li>
+              <li><a href="https://developer.openstack.org/id/api-guide/quick-start/">Indonesian (id)</a></li>
+              <li><a href="https://developer.openstack.org/ja/api-guide/quick-start/">Japanese (ja)</a></li>
+              <li><a href="https://developer.openstack.org/ko_KR/api-guide/quick-start/">Korean (ko_KR)</a></li>
+              <li><a href="https://developer.openstack.org/zh_CN/api-guide/quick-start/">Chinese (zh_CN)</a></li>
             </ul>
          </div>
          <div id="cli">
@@ -640,10 +640,10 @@
             </p>
             <p>
                To install the CLIs, see <a target="_top" class="link"
-               href="http://docs.openstack.org/user-guide/common/cli_install_openstack_command_line_clients.html">Install the CLIs</a>.
+               href="https://docs.openstack.org/user-guide/common/cli_install_openstack_command_line_clients.html">Install the CLIs</a>.
             </p>
             <p>
-               To use the CLIs, see <a class="link" href="http://docs.openstack.org/user-guide/cli.html"
+               To use the CLIs, see <a class="link" href="https://docs.openstack.org/user-guide/cli.html"
                target="_top">OpenStack command-line clients</a>.
             </p>
          </div>
@@ -652,7 +652,7 @@
       <hr/>
       <p>
          Documentation treated like code, powered by the community - interested? Here's
-         <a href="http://docs.openstack.org/contributor-guide/">
+         <a href="https://docs.openstack.org/contributor-guide/">
          how to contribute
          </a>
          .
diff --git a/www/templates/css.tmpl b/www/templates/css.tmpl
index 20b330c8a..bf83176d9 100644
--- a/www/templates/css.tmpl
+++ b/www/templates/css.tmpl
@@ -8,8 +8,8 @@
 
     <!-- Fonts -->
     <!--<link href="{{ cssdir }}font-awesome.min.css" rel="stylesheet">-->
-    <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/www/templates/footer.tmpl b/www/templates/footer.tmpl
index 966579fde..c31fdc7dd 100644
--- a/www/templates/footer.tmpl
+++ b/www/templates/footer.tmpl
@@ -4,38 +4,38 @@
                 <div class="col-lg-2 col-sm-2">
                     <h3>OpenStack</h3>
                     <ul>
-                        <li><a href="http://openstack.org/projects/">Projects</a></li>
-                        <li><a href="http://openstack.org/projects/openstack-security/">OpenStack Security</a></li>
-                        <li><a href="http://openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                        <li><a href="http://openstack.org/blog/">Blog</a></li>
-                        <li><a href="http://openstack.org/news/">News</a></li>
+                        <li><a href="https://www.openstack.org/projects/">Projects</a></li>
+                        <li><a href="https://www.openstack.org/projects/openstack-security/">OpenStack Security</a></li>
+                        <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
+                        <li><a href="https://www.openstack.org/blog/">Blog</a></li>
+                        <li><a href="https://www.openstack.org/news/">News</a></li>
                     </ul>
                 </div>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Community</h3>
                     <ul>
-                        <li><a href="http://openstack.org/community/">User Groups</a></li>
-                        <li><a href="http://openstack.org/community/events/">Events</a></li>
-                        <li><a href="http://openstack.org/community/jobs/">Jobs</a></li>
-                        <li><a href="http://openstack.org/foundation/companies/">Companies</a></li>
-                        <li><a href="http://docs.openstack.org/infra/manual/developers.html">Contribute</a></li>
+                        <li><a href="https://www.openstack.org/community/">User Groups</a></li>
+                        <li><a href="https://www.openstack.org/community/events/">Events</a></li>
+                        <li><a href="https://www.openstack.org/community/jobs/">Jobs</a></li>
+                        <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
+                        <li><a href="https://docs.openstack.org/infra/manual/developers.html">Contribute</a></li>
                     </ul>
                 </div>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Documentation</h3>
                     <ul>
-                        <li><a href="http://docs.openstack.org">OpenStack Manuals</a></li>
-                        <li><a href="http://openstack.org/software/start/">Getting Started</a></li>
-                        <li><a href="http://developer.openstack.org">API Documentation</a></li>
+                        <li><a href="https://docs.openstack.org">OpenStack Manuals</a></li>
+                        <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
+                        <li><a href="https://developer.openstack.org">API Documentation</a></li>
                         <li><a href="https://wiki.openstack.org">Wiki</a></li>
                     </ul>
                 </div>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Branding & Legal</h3>
                     <ul>
-                        <li><a href="http://openstack.org/brand/">Logos & Guidelines</a></li>
-                        <li><a href="http://openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                        <li><a href="http://openstack.org/privacy/">Privacy Policy</a></li>
+                        <li><a href="https://www.openstack.org/brand/">Logos & Guidelines</a></li>
+                        <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
+                        <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
                         <li><a href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement">OpenStack CLA</a></li>
                     </ul>
                 </div>
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index 58dce3ad3..f19fd95e6 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -59,67 +59,67 @@ id="bs-example-navbar-collapse-1">
             </li>
 
             <li>
-    <a href="http://www.openstack.org/software/" class="drop" id="dropdownMenuSoftware">Software <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/software/" class="drop" id="dropdownMenuSoftware">Software <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuSoftware">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/">Overview</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/project-navigator/">Project Navigator</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/sample-configs/">Sample Configs</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/project-navigator/">Project Navigator</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/sample-configs/">Sample Configs</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/start/">Get Started</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/roadmap/">Roadmap</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/latest-release/">Latest Release</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/software/sourcecode/">Source Code</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/start/">Get Started</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/roadmap/">Roadmap</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/latest-release/">Latest Release</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/software/sourcecode/">Source Code</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/user-stories/" class="drop" id="dropdownMenuUsers">Users <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/user-stories/" class="drop" id="dropdownMenuUsers">Users <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuUsers">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/user-stories/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/user-stories/">Overview</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/enterprise/">OpenStack in the Enterprise</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/appdev/">Application Developers</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/enterprise/">OpenStack in the Enterprise</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/appdev/">Application Developers</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//superuser.openstack.org/">Superuser Magazine</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/surveys/landing">User Survey</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/community/" class="drop" id="dropdownMenuCommunity">Community <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/community/" class="drop" id="dropdownMenuCommunity">Community <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuCommunity">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/">Welcome! Start Here</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/foundation/">OpenStack Foundation</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://wiki.openstack.org">OpenStack Wiki</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://groups.openstack.org">User Groups</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/">Welcome! Start Here</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/">OpenStack Foundation</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://wiki.openstack.org">OpenStack Wiki</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://groups.openstack.org">User Groups</a></li>
         <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/foundation/companies/">Supporting Companies</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/jobs/">Jobs</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/companies/">Supporting Companies</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/jobs/">Jobs</a></li>
         <li role="presentation" class="divider"></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/join/">Join The Community</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/marketplace/">Marketplace</a>
+    <a href="https://www.openstack.org/marketplace/">Marketplace</a>
 </li>
 <li>
-    <a href="http://www.openstack.org/events/" class="drop" id="dropdownMenuEvents">Events <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/events/" class="drop" id="dropdownMenuEvents">Events <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuEvents">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/events/">Overview</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/summit/">The OpenStack Summit</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/community/events/">OpenStack Days</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/events/">Overview</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/summit/">The OpenStack Summit</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/events/">OpenStack Days</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://www.openstack.org/learn/" class="drop" id="dropdownMenuLearn">Learn <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
+    <a href="https://www.openstack.org/learn/" class="drop" id="dropdownMenuLearn">Learn <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuEvents">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/marketplace/training/">Training</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/marketplace/training/">Training</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//superuser.openstack.org">Superuser Magazine</a></li>
         <li role="presentation"><a role="menuitem" tabindex="-1" href="//ask.openstack.org">Ask a Technical Question</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/news/">News</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="http://www.openstack.org/blog/">Blog</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/summit/tokyo-2015/videos/">Summit Videos</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/news/">News</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/blog/">Blog</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/videos/">Summit Videos</a></li>
     </ul>
 </li>
 <li>
-    <a href="http://docs.openstack.org/">Docs</a>
+    <a href="https://docs.openstack.org/">Docs</a>
 </li>
 <li>