Make all absolute links use https:// instead of http://

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/templates/admin-planet.html b/templates/admin-planet.html
index c40118d1c043bdddbec3da69c7c597c08d32266f..6c3ab5bcfae37638de8242c0bea57d09b2119111 100644 (file)
--- a/templates/admin-planet.html
+++ b/templates/admin-planet.html
@@ -20,7 +20,7 @@
                                                {{ entry.author.name }}
                                        </td>
                                        <td>
-                                               <a href="http://planet.ipfire.org/post/{{ entry.slug }}" target="_blank">{{ entry.title }}</a>
+                                               <a href="https://planet.ipfire.org/post/{{ entry.slug }}" target="_blank">{{ entry.title }}</a>
                                                {% if entry.is_draft() %}
                                                        <span class="label label-warning">{{ _("Draft") }}</span>
                                                {% end %}

diff --git a/templates/base.html b/templates/base.html
index 411dabb6efc73b006a6a53211f6a1d6f295c6934..18940de49e7102b46b7df9ecc192e00d8d26758f 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -79,7 +79,7 @@
 
                                                        <ul class="list-unstyled">
                                                                <li>
-                                                                       <a href="http://www.ipfire.org/about">{{ _("About IPFire") }}</a>
+                                                                       <a href="https://www.ipfire.org/about">{{ _("About IPFire") }}</a>
                                                                </li>
                                                                <li>
                                                                        <a href="https://downloads.ipfire.org">{{ _("Download") }}</a>
@@ -88,7 +88,7 @@
                                                                        <a href="https://planet.ipfire.org">{{ _("Planet") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="http://www.ipfire.org/legal">{{ _("Legal") }}</a>
+                                                                       <a href="https://www.ipfire.org/legal">{{ _("Legal") }}</a>
                                                                </li>
                                                        </ul>
                                                </div>
@@ -98,10 +98,10 @@
 
                                                        <ul class="list-unstyled">
                                                                <li>
-                                                                       <a href="http://www.ipfire.org/get-support#professional">{{ _("Professional Support") }}</a>
+                                                                       <a href="https://www.ipfire.org/get-support#professional">{{ _("Professional Support") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="http://wiki.ipfire.org">{{ _("Documentation") }}</a>
+                                                                       <a href="https://wiki.ipfire.org">{{ _("Documentation") }}</a>
                                                                </li>
                                                        </ul>
                                                </div>
@@ -111,16 +111,16 @@
 
                                                        <ul class="list-unstyled">
                                                                <li>
-                                                                       <a href="http://forum.ipfire.org">{{ _("Forum") }}</a>
+                                                                       <a href="https://forum.ipfire.org">{{ _("Forum") }}</a>
                                                                </li>
                                                                <li>
                                                                        <a href="//www.ipfire.org/chat">{{ _("Chat") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="http://lists.ipfire.org">{{ _("Mailing Lists") }}</a>
+                                                                       <a href="https://lists.ipfire.org">{{ _("Mailing Lists") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="http://talk.ipfire.org">{{ _("Talk") }}</a>
+                                                                       <a href="https://talk.ipfire.org">{{ _("Talk") }}</a>
                                                                </li>
                                                        </ul>
                                                </div>
@@ -130,7 +130,7 @@
 
                                                        <ul class="list-unstyled">
                                                                <li>
-                                                                       <a href="http://wiki.ipfire.org/devel/start">{{ _("Become a developer") }}</a>
+                                                                       <a href="https://wiki.ipfire.org/devel/start">{{ _("Become a developer") }}</a>
                                                                </li>
                                                                <li>
                                                                        <a href="https://pakfire.ipfire.org">{{ _("Pakfire Build Service") }}</a>
@@ -139,7 +139,7 @@
                                                                        <a href="https://bugzilla.ipfire.org">{{ _("Bugtracker") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="http://patchwork.ipfire.org">{{ _("Patchwork") }}</a>
+                                                                       <a href="https://patchwork.ipfire.org">{{ _("Patchwork") }}</a>
                                                                </li>
                                                        </ul>
                                                </div>
@@ -151,7 +151,7 @@
                                                        </a>
 
                                                        <div class="btn-toolbar justify-content-around col-md-6 offset-md-3">
-                                                               <a class="btn btn-sm" href="http://www.ipfire.org/news.rss">
+                                                               <a class="btn btn-sm" href="https://www.ipfire.org/news.rss">
                                                                        <svg class="icon i_rss"><use xlink:href="#rss"/></svg>
                                                                </a>
                                                                <a class="btn btn-sm" href="https://twitter.com/ipfire">

diff --git a/templates/download-splash.html b/templates/download-splash.html
index e92cf19cb6bdca0aa4a3b1536536b866f86d97df..4ed6d62daba6ad871c9b7a563d3cd11fcd68ff79 100644 (file)
--- a/templates/download-splash.html
+++ b/templates/download-splash.html
@@ -18,7 +18,7 @@
        <section class="container content-section text-center">
                <div class="row">
                        <div class="col-lg-4 col-md-4">
-                               <a class="link-normal" href="http://wiki.ipfire.org/en/installation/start">
+                               <a class="link-normal" href="https://wiki.ipfire.org/en/installation/start">
                                        <span class="fa fa-4x fa-terminal"></span>
                                        <h3>{{ _("How to install IPFire") }}</h3>
                                </a>
@@ -32,7 +32,7 @@
                        </div>
 
                        <div class="col-lg-4 col-md-4">
-                               <a class="link-normal" href="http://www.ipfire.org/get-support">
+                               <a class="link-normal" href="https://www.ipfire.org/get-support">
                                        <span class="fa fa-4x fa-question"></span>
                                        <h3>{{ _("Get Support") }}</h3>
                                </a>

diff --git a/templates/downloads-mirrors.html b/templates/downloads-mirrors.html
index fd80eb1470a6be4a3bfba72964ebeec768586e38..61a2c912dda04472cc38c67711642f80d1f2f9db 100644 (file)
--- a/templates/downloads-mirrors.html
+++ b/templates/downloads-mirrors.html
@@ -20,7 +20,7 @@
                                
                                <ul>
                                        <li>
-                                               <a href="http://wiki.ipfire.org/project/web"
+                                               <a href="https://wiki.ipfire.org/project/web"
                                                        target="_blank">How do I contribute a mirror server?</a>
                                        </li>
                                </ul>

diff --git a/templates/fireinfo/profile-notfound.html b/templates/fireinfo/profile-notfound.html
index 23f0cc1499daa681f450a0c1e92e303f544ed41e..e6aa1ace847ff855880ec0fd607563245e8295aa 100644 (file)
--- a/templates/fireinfo/profile-notfound.html
+++ b/templates/fireinfo/profile-notfound.html
@@ -19,7 +19,7 @@
                        </p>
                        <p>
                                If this is your own profile, you can
-                               <a href="http://wiki.ipfire.org/en/fireinfo/my_profile" target="_blank">enable</a>
+                               <a href="https://wiki.ipfire.org/en/fireinfo/my_profile" target="_blank">enable</a>
                                the submission on the web user interface.
                        </p>
                </div>

diff --git a/templates/geoip/index.html b/templates/geoip/index.html
index ea44a67dd49f0aae7220e0477b44e9fe64b1713e..72053e5c41ba4c183ce4791028a5d1f8a09f066c 100644 (file)
--- a/templates/geoip/index.html
+++ b/templates/geoip/index.html
@@ -42,7 +42,7 @@
                                                <ul>
                                                        {% for mirror in mirrors %}
                                                                <li>
-                                                                       <a href="http://mirrors.ipfire.org/mirror/{{ mirror.hostname }}">
+                                                                       <a href="https://mirrors.ipfire.org/mirror/{{ mirror.hostname }}">
                                                                                {{ mirror.hostname }}
                                                                        </a>
                                                                        <span class="pull-right">

diff --git a/templates/index.html b/templates/index.html
index c01cee7bd8033c653a76798e22c8ec2e6e43ebb4..61aab0a93b0dfd1e34d647ccedf656843b2476a7 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -104,7 +104,7 @@
                                                <h4 class="pb-3">{{ _("Trusted by thousands") }}</h4>
                                                <p>
                                                        IPFire is developed in Europe and used all over the world
-                                                       <a href="http://fireinfo.ipfire.org/statistics/geo-locations">in hundreds of countries</a>
+                                                       <a href="https://fireinfo.ipfire.org/statistics/geo-locations">in hundreds of countries</a>
                                                        by hundreds of thousands of users every day.
                                                </p>
                                        </div>
@@ -155,7 +155,7 @@
                                                                                <strong>{{ item.title }}</strong>
                                                                        </a>
                                                                {% elif type == "planet" %}
-                                                                       <a href="http://planet.ipfire.org/post/{{ item.slug }}">
+                                                                       <a href="https://planet.ipfire.org/post/{{ item.slug }}">
                                                                                {{ item.title }}
                                                                        </a>
                                                                {% end %}
@@ -233,7 +233,7 @@
                        <div class="row mb-lg-6 mb-md-4 pb-6 pb-lg-4">
                                <div class="col-md-12 col-lg-7 mb-5 mb-md-6 mb-lg-0">
                                        <p class="lead">
-                                               <a href="http://www.lightningwirelabs.com" target="_blank">Lightning Wire Labs</a> offer
+                                               <a href="https://www.lightningwirelabs.com" target="_blank">Lightning Wire Labs</a> offer
                                                IPFire hardware appliances for enterprises, large businesses and SOHO.
                                                Deploying one of these on your network will provide you with the
                                                greatest reliability, stability and performance.

diff --git a/templates/modules/menu.html b/templates/modules/menu.html
index 09ccb3982149c6a24c4b6e2e87de0bc2c206bf19..302290a940613856317790bf2a4b39e6605c7e2c 100644 (file)
--- a/templates/modules/menu.html
+++ b/templates/modules/menu.html
@@ -37,7 +37,7 @@
                </li>
        {% elif hostname in ("downloads.ipfire.org", "download.ipfire.org") %}
                <li class="nav-item">
-                       <a class="nav-link" href="http://mirrors.ipfire.org">{{ _("Mirrors") }}</a>
+                       <a class="nav-link" href="https://mirrors.ipfire.org">{{ _("Mirrors") }}</a>
                </li>
        {% elif hostname == "fireinfo.ipfire.org" %}
                <li class="nav-item">
@@ -60,7 +60,7 @@
                </li>
 
                <li class="nav-item">
-                       <a class="nav-link" href="http://wiki.ipfire.org/en/community/talk.ipfire.org/start">
+                       <a class="nav-link" href="https://wiki.ipfire.org/en/community/talk.ipfire.org/start">
                                {{ _("Documentation") }}
                        </a>
                </li>

diff --git a/templates/modules/news-item.html b/templates/modules/news-item.html
index c8ae423fbc02e794bc9cdcad827ff4a5cfe7d9fa..ab36de2799dade162bcd493dbdaf5aea517a437e 100644 (file)
--- a/templates/modules/news-item.html
+++ b/templates/modules/news-item.html
@@ -5,7 +5,7 @@
                                {% if announcement %}
                                        {{ _("Announcement") }}:
                                {% end %}
-                               <a href="http://www.ipfire.org/news/{{ item.slug }}">{{ item.title }}</a>
+                               <a href="https://www.ipfire.org/news/{{ item.slug }}">{{ item.title }}</a>
                        </h2>
                {% end %}
 

diff --git a/templates/modules/sidebar-banner.html b/templates/modules/sidebar-banner.html
index c1958946b2fdef83825fbb5fe9d44b8eb3a6ee8e..f15a4c297f5bd36cff4ffa525007f00f0d6c6883 100644 (file)
--- a/templates/modules/sidebar-banner.html
+++ b/templates/modules/sidebar-banner.html
@@ -1,6 +1,6 @@
 {% if item %}
        <h4>{{ item.caption }}</h4>
-       <a href="{{ item.uri }}" {% if item.uri.startswith("http://") %}target="_blank" {% end %}>
+       <a href="{{ item.uri }}" {% if item.uri.startswith("https://") %}target="_blank" {% end %}>
                <img src="{{ static_url("images/banners/" + item.image) }}" border="0" alt="{{ _("Banner") }}" />
        </a>
 {% end %}

diff --git a/templates/news.html b/templates/news.html
index eadeaedc1592e8e876d6d4dfeffa7ceeed70c2c8..ac67531bf36969a5f2f0bbe03f07c89d1effe3a7 100644 (file)
--- a/templates/news.html
+++ b/templates/news.html
@@ -25,7 +25,7 @@
                        <p>
                                You can get the latest IPFire news directly to
                                your mailbox by subscribing to the
-                               <a href="http://lists.ipfire.org/mailman/listinfo/ipfire-announce">ipfire-announce</a>
+                               <a href="https://lists.ipfire.org/mailman/listinfo/ipfire-announce">ipfire-announce</a>
                                mailing list.
                        </p>
                        <p>

diff --git a/templates/planet/modules/author-box.html b/templates/planet/modules/author-box.html
index 9a27605d0a5d12d1fd9b285d76b01572be2eb212..ed9de6536d62621ef7afbbfaf8e23affbcd23b0c 100644 (file)
--- a/templates/planet/modules/author-box.html
+++ b/templates/planet/modules/author-box.html
@@ -16,7 +16,7 @@
 
                {% if author.is_talk_enabled() %}
                        <li>
-                               <a href="http://talk.ipfire.org/phonebook/{{ author.uid }}"
+                               <a href="https://talk.ipfire.org/phonebook/{{ author.uid }}"
                                                title="{{ _("%s on talk.ipfire.org") % author.name }}">
                                        <i class="glyphicon glyphicon-earphone"></i>
                                </a>

diff --git a/templates/static/artwork.html b/templates/static/artwork.html
index 132e398cd822994a9e694258b83dce543340461f..f522ccd11f8f6aa1d05412f1e486cf2597af30e4 100644 (file)
--- a/templates/static/artwork.html
+++ b/templates/static/artwork.html
@@ -40,7 +40,7 @@
 
        <p>
                These artworks have been designed by
-               <a href="http://www.elricco.com">elricco media services</a>.
+               <a href="https://www.elricco.com">elricco media services</a>.
        </p>
 
        <div class="row">

diff --git a/templates/static/features.html b/templates/static/features.html
index c31f32035bb72baaed052e66a3797d7e55d57f0f..a52acf948a57e06c4753489aea9d0545af0a0b7c 100644 (file)
--- a/templates/static/features.html
+++ b/templates/static/features.html
@@ -201,20 +201,20 @@
                
                                        <h4 class="secondHeadline">Web User-Interface screenshots</h4>
                
-                                       <div class="row my-gallery" itemscope itemtype="http://schema.org/ImageGallery">
-                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                       <div class="row my-gallery" itemscope itemtype="https://schema.org/ImageGallery">
+                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                        <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/rules.png") }}" itemprop="contentUrl" data-size="999x589">
                                                                <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/rules.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                        </a>
                                                </figure>
                                                
-                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                        <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/new-rule.png") }}" itemprop="contentUrl" data-size="1033x1077">
                                                                <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/new-rule.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                        </a>
                                                </figure>
                
-                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                        <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/service-groups.png") }}" itemprop="contentUrl" data-size="977x825">
                                                                <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/service-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                        </a>
@@ -222,13 +222,13 @@
                                        </div>
                
                                        <div class="row my-gallery">
-                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                        <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/host-groups.png") }}" itemprop="contentUrl" data-size="1029x675">
                                                                <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/host-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                        </a>
                                                </figure>
                
-                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                        <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}" itemprop="contentUrl" data-size="776x686">
                                                                <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                        </a>
@@ -266,14 +266,14 @@
                                        </ul>
                                </p>
                
-                               <div class="row my-gallery" itemscope itemtype="http://schema.org/ImageGallery">
-                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                               <div class="row my-gallery" itemscope itemtype="https://schema.org/ImageGallery">
+                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}" itemprop="contentUrl" data-size="770x508">
                                                        <img class="img-fluid" src="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                </a>
                                        </figure>
        
-                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}" itemprop="contentUrl" data-size="698x284">
                                                        <img class="img-fluid" src="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                </a>
@@ -689,8 +689,8 @@
                                        <a href="/features/ports/arm">ARM project page</a>.
                                </p> -->
 
-                               <div class="row my-gallery" itemscope itemtype="http://schema.org/ImageGallery">
-                                       <figure class="col-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                               <div class="row my-gallery" itemscope itemtype="https://schema.org/ImageGallery">
+                                       <figure class="col-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                <a class="thumbnail" href="{{ static_url("images/screenshots/en/hardware/hwtemp-1.png") }}" itemprop="contentUrl" data-size="756x432">
                                                        <img class="img-fluid" src="{{ static_url("images/screenshots/en/hardware/hwtemp-1_thumb.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                </a>
@@ -754,7 +754,7 @@
                                </p>
 
                                <div class="row my-gallery">
-                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+                                       <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
                                                <a class="thumbnail" href="{{ static_url("images/screenshots/en/virtualization/virt-manager-1.png") }}" itemprop="contentUrl" data-size="605x375">
                                                        <img class="img-fluid" src="{{ static_url("images/screenshots/en/virtualization/virt-manager-1_thumb.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                </a>

diff --git a/templates/static/get-involved.html b/templates/static/get-involved.html
index 3920481a50a2d83a808d83cce27391a97eb1a8cc..6f527298999620beb528f648239f07bab81d3e4a 100644 (file)
--- a/templates/static/get-involved.html
+++ b/templates/static/get-involved.html
@@ -25,7 +25,7 @@
                                                </div>
                        
                                                <div class="col-md-4 text-center">
-                                                       <a href="http://lists.ipfire.org" class="link-normal">
+                                                       <a href="https://lists.ipfire.org" class="link-normal">
                                                                <span class="fa fa-4x fa-envelope-o"></span>
                                                                <h3>{{ _("Mailing Lists") }}</h3>
                                                        </a>
@@ -51,7 +51,7 @@
                                                        <a href="//lists.ipfire.org/">Mailing Lists</a>.
                                                </p>
                                                
-                                               <a class="btn btn-white mb-3" href="http://forum.ipfire.org/search.php?search_id=unanswered">{{ _("Unanswered questions on the forums") }}</a>
+                                               <a class="btn btn-white mb-3" href="https://forum.ipfire.org/search.php?search_id=unanswered">{{ _("Unanswered questions on the forums") }}</a>
                                                <a class="btn btn-white" href="/chat">{{ _("On our Jabber/IRC channels") }}</a>
                                        </section>
                                                                        
@@ -63,7 +63,7 @@
                                                        documented, improved, or rewritten? Sign up and get it done!
                                                </p>
                                                
-                                               <a class="btn btn-white" href="http://wiki.ipfire.org">{{ _("IPFire Wiki") }}</a>
+                                               <a class="btn btn-white" href="https://wiki.ipfire.org">{{ _("IPFire Wiki") }}</a>
                                        </section>
                                </div>
                        
@@ -89,7 +89,7 @@
                                                        today.
                                                </p>
                                                
-                                               <a class="btn btn-white mr-3" href="http://wiki.ipfire.org/devel/submit-patches">{{ _("Submit Patches") }}</a>
+                                               <a class="btn btn-white mr-3" href="https://wiki.ipfire.org/devel/submit-patches">{{ _("Submit Patches") }}</a>
                                                <a class="btn btn-white" href="https://pakfire.ipfire.org/">{{ _("Pakfire Build Service") }}</a>
                                        </section>
                                </div>
@@ -103,8 +103,8 @@
                                                        reports.
                                                </p>
                                                
-                                               <a class="btn btn-white mr-3" href="http://bugzilla.ipfire.org">{{ _("IPFire Bugzilla") }}</a>
-                                               <a class="btn btn-white" href="http://wiki.ipfire.org/devel/bugzilla">{{ _("Dealing with bug reports") }}</a>
+                                               <a class="btn btn-white mr-3" href="https://bugzilla.ipfire.org">{{ _("IPFire Bugzilla") }}</a>
+                                               <a class="btn btn-white" href="https://wiki.ipfire.org/devel/bugzilla">{{ _("Dealing with bug reports") }}</a>
                                        </section>
                                        
                                        <section id="infrastructure" class="col-5 offset-2">
@@ -116,7 +116,7 @@
                                                        appreciates your support.
                                                </p>
                                                
-                                               <a class="btn btn-white" href="http://wiki.ipfire.org/en/project/mirror">{{ _("Host a mirror") }}</a>
+                                               <a class="btn btn-white" href="https://wiki.ipfire.org/en/project/mirror">{{ _("Host a mirror") }}</a>
                                        </section>
                                </div>
                                

diff --git a/templates/static/get-started.html b/templates/static/get-started.html
index eab813708d6a96b648e6799b38d8a97f3db3fc4f..daf3649659d4077ddfc8be3e6b2f4a7c744ca1f3 100644 (file)
--- a/templates/static/get-started.html
+++ b/templates/static/get-started.html
@@ -21,7 +21,7 @@
 
                        <p class="lead">
                                IPFire is a free software distribution that you can install on
-                               any hardware that <a href="http://wiki.ipfire.org/en/hardware/start">fits the requirements</a>
+                               any hardware that <a href="https://wiki.ipfire.org/en/hardware/start">fits the requirements</a>
                                and is best for your environment's needs.
                        </p>
 
@@ -38,7 +38,7 @@
                        <h2>{{ _("Installation") }}</h2>
 
                        <p class="lead">
-                               The <a href="http://wiki.ipfire.org/en/installation/start">installation handbook</a>
+                               The <a href="https://wiki.ipfire.org/en/installation/start">installation handbook</a>
                                on the IPFire wiki will guide you through the entire installation process
                                from the beginning to the end.
                        </p>
@@ -47,7 +47,7 @@
                                <a class="btn btn-primary btn-lg" href="/download">
                                        {{ _("Download") }}
                                </a>
-                               <a class="btn btn-info btn-lg" href="http://wiki.ipfire.org/en/installation/start">
+                               <a class="btn btn-info btn-lg" href="https://wiki.ipfire.org/en/installation/start">
                                        {{ _("Installation Handbook") }}
                                </a>
                        </div>
@@ -60,7 +60,7 @@
 
                        <p class="lead">
                                IPFire is easy to set up and use. The IPFire wiki
-                               <a href="http://wiki.ipfire.org/en/configuration/start">has great documentation</a>
+                               <a href="https://wiki.ipfire.org/en/configuration/start">has great documentation</a>
                                about all features and answers almost any question.
                        </p>
 

diff --git a/templates/static/hardware.html b/templates/static/hardware.html
index 773059d274b6c6c65918cac76e0848588807f9e0..f3b3d5f8d5138c284c73a3374ad51c87d0473e89 100644 (file)
--- a/templates/static/hardware.html
+++ b/templates/static/hardware.html
@@ -19,7 +19,7 @@
        <section id="ipfire-professional" class="container content-section">
                <h3 class="text-center">
                        IPFire Premium/Professional Appliance {{ _("by") }}
-                       <a href="http://www.lightningwirelabs.com">Lightning Wire Labs</a>
+                       <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a>
                </h3>
 
                <p class="ac">
@@ -36,8 +36,8 @@
 
                <p class="ac">
                        <strong>
-                               The <a href="http://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Premium Appliance and IPFire Professional Appliance</a>
-                               by <a href="http://www.lightningwirelabs.com">Lightning Wire Labs</a> integrate well in every infrastructure of any company.
+                               The <a href="https://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Premium Appliance and IPFire Professional Appliance</a>
+                               by <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a> integrate well in every infrastructure of any company.
                                They are reliable and deliver the performance that is needed at all times.
                        </strong>
                </p>
@@ -98,7 +98,7 @@
        <section id="ipfire-eco" class="container content-section">
                <h3 class="text-center">
                        IPFire Eco Appliance {{ _("by") }}
-                       <a href="http://www.lightningwirelabs.com">Lightning Wire Labs</a>
+                       <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a>
                </h3>
 
                <div class="row">
@@ -136,8 +136,8 @@
 
                <p class="ac">
                        <strong>
-                               The <a href="http://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Eco Appliance</a>
-                               by <a href="http://www.lightningwirelabs.com">Lightning Wire Labs</a> brings all the features<br>
+                               The <a href="https://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Eco Appliance</a>
+                               by <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a> brings all the features<br>
                                IPFire has to offer at a small form-factor and with great power-efficiency.
                        </strong>
                </p>
@@ -148,7 +148,7 @@
                        <div class="col-md-7">
                                <h3>
                                        IPFire Duo Box
-                                       {{ _("by") }} <a href="http://www.fountainnetworks.com">Fountain Networks</a>
+                                       {{ _("by") }} <a href="https://www.fountainnetworks.com">Fountain Networks</a>
                                </h3>
 
                                <table class="table table-condensed">
@@ -198,14 +198,14 @@
                                <p class="ac">
                                        <strong>
                                                The <a href="https://www.fountainnetworks.com/ipfire-duo-box">IPFire Duo Box</a>
-                                               by <a href="http://www.fountainnetworks.com/">Fountain Networks</a>
+                                               by <a href="https://www.fountainnetworks.com/">Fountain Networks</a>
                                                is a great system for starters who are searching for something small but still powerful.
                                        </strong>
                                </p>
                        </div>
 
                        <div class="col-md-4 col-md-offset-1">
-                               <a href="http://www.fountainnetworks.com/fountain-networks-products/ipfire-prime-box.html">
+                               <a href="https://www.fountainnetworks.com/fountain-networks-products/ipfire-prime-box.html">
                                        <img class="img-responsive" src="{{ static_url("images/LWL/appliance-prime.jpg") }}">
                                </a>
                        </div>
@@ -216,7 +216,7 @@
                <p class="lead ac">
                        You can find more example configurations, recommended hardware and information
                        about individual components like the best network controllers and more in the
-                       <a href="http://wiki.ipfire.org/en/hardware/start">hardware section on the IPFire wiki</a>.
+                       <a href="https://wiki.ipfire.org/en/hardware/start">hardware section on the IPFire wiki</a>.
                </p>
        </section>
 {% end block %}

diff --git a/templates/static/legal.html b/templates/static/legal.html
index f9767f10bd79e75060309188946e7fd076949af7..a51d4753e65ab340e5337f17067bd13afa5d292c 100644 (file)
--- a/templates/static/legal.html
+++ b/templates/static/legal.html
@@ -21,7 +21,7 @@
 
                                <ul class="list-inline">
                                        <li>
-                                               <a href="http://talk.ipfire.org/phonebook/ms">
+                                               <a href="https://talk.ipfire.org/phonebook/ms">
                                                        <span class="glyphicon glyphicon-earphone"></span>
                                                </a>
                                        </li>
@@ -41,7 +41,7 @@
 
                                <ul class="list-inline">
                                        <li>
-                                               <a href="http://talk.ipfire.org/phonebook/arne_f">
+                                               <a href="https://talk.ipfire.org/phonebook/arne_f">
                                                        <span class="glyphicon glyphicon-earphone"></span>
                                                </a>
                                        </li>
@@ -61,7 +61,7 @@
 
                                <ul class="list-inline">
                                        <li>
-                                               <a href="http://talk.ipfire.org/phonebook/stevee">
+                                               <a href="https://talk.ipfire.org/phonebook/stevee">
                                                        <span class="glyphicon glyphicon-earphone"></span>
                                                </a>
                                        </li>

diff --git a/webapp/__init__.py b/webapp/__init__.py
index 9e953fd175a5c731998f6c7af5b15c30d91178ad..0a241d17d3498ba83236a404f37b44263484ddd1 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -112,8 +112,8 @@ class Application(tornado.web.Application):
                        (r"/release/([\w\.\-]*)", DownloadsReleaseHandler),
                        (r"/older", DownloadsOlderHandler),
                        (r"/development", DownloadsDevelopmentHandler),
-                       (r"/mirrors", tornado.web.RedirectHandler, { "url" : "http://mirrors.ipfire.org/" }),
-                       (r"/source", tornado.web.RedirectHandler, { "url" : "http://source.ipfire.org/" }),
+                       (r"/mirrors", tornado.web.RedirectHandler, { "url" : "https://mirrors.ipfire.org/" }),
+                       (r"/source", tornado.web.RedirectHandler, { "url" : "https://source.ipfire.org/" }),
                        (r"/download-splash", DownloadSplashHandler),
                ] + static_handlers + [
                        (r"/(iso|torrent)/(.*)", DownloadCompatHandler),
@@ -186,7 +186,7 @@ class Application(tornado.web.Application):
                # boot.ipfire.org
                BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
                self.add_handlers(r"boot(\.dev)?\.ipfire\.org", [
-                       (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/download" }),
+                       (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download" }),
 
                        # Configurations
                        (r"/premenu.cfg", PremenuCfgHandler),
@@ -256,7 +256,7 @@ class Application(tornado.web.Application):
 
                # ipfire.org
                self.add_handlers(r".*", [
-                       (r".*", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org" })
+                       (r".*", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org" })
                ])
 
                logging.info("Successfully initialied application")

diff --git a/webapp/handlers_rss.py b/webapp/handlers_rss.py
index e3755fdfab04a479cdc409141ae8a9e912be2519..0ea9b4d885c6f0ebaee41ca92feb3f107576bd6e 100644 (file)
--- a/webapp/handlers_rss.py
+++ b/webapp/handlers_rss.py
@@ -68,7 +68,7 @@ class RSSNewsHandler(RSSHandler):
                                "title"     : n.title,
                                "author"    : n.author,
                                "published" : n.published,
-                               "url"       : "http://www.ipfire.org/news/%s" % n.slug,
+                               "url"       : "https://www.ipfire.org/news/%s" % n.slug,
                                "markup"    : n.text,
                        })
                        items.append(item)