remove the /https/ page, now that we use generally accepted LE certs.

2 files changed, 0 insertions, 51 deletions

diff --git a/templates/public/https.html b/templates/public/https.html
deleted file mode 100644
index 9d54646a..00000000
--- a/templates/public/https.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "base.html" %}
-{% load wiki %}
-{% block title %}{{ BRANDING_DISTRONAME }} - HTTPS Only site{% endblock %}
-{% block content %}
-<div class="box">
-    <h2 class="title">This is the unsecure version of the website</h2>
-
-    <p>Hi! This is not the main site. You're seeing this message because you
-    entered our website without using a secure connection. We like privacy for
-    all so we've decided to serve our website only through secure channels. This
-    is the <em>only</em> page on the whole site that can be accessed without a
-    secure connection, all other pages will redirect to the secure version.</p>
-
-    <h2><a href="https://www.parabola.nu/">Enter the secure site</a></h2>
-
-    <h3>But my browser says the secure site is untrusted</h3>
-
-    <p>This website's certificate issued by
-    <a href="http://cacert.org">CAcert</a>. Some web browsers or operating
-    systems still don't provide CAcert's root certificate, so if you find a huge
-    error message telling you're about to do something bad, come back here and
-    keep reading.</p>
-
-    <h4>Installing CAcert's root certificate</h4>
-
-    <p>You should ask your web browser or operating system to
-    <a href="http://wiki.cacert.org/InclusionStatus">include</a> CAcert's root
-    certificates.</p>
-    
-    <p>You can install CAcert's root certificates yourself by
-    <a href="http://www.cacert.org/index.php?id=3">downloading</a> them and
-    following <a href="http://wiki.cacert.org/BrowserClients">these
-    instructions</a> on how to install them in your browser.</p>
-
-    <h4>But installing the certificate sounds hard/complicated/boring</h4>
-
-    <p>You could just click "Ignore", or "Add Exception", or however your
-    browser words it. But then, you wouldn't know that the site is actually
-    coming from us; there could be someone in the middle tricking you, or
-    spying on you and looking at which webpages you visit.</p>
-
-    <h2>I just want to get the installer ISOs</h2>
-
-    <p>You can proceed to our
-    <a href="{% wiki_url 'Get Parabola' %}">ISOs download page</a> on
-    <a href="{% wiki_url %}">our wiki</a>.</p>
-
-</div>
-{% endblock %}
diff --git a/urls.py b/urls.py
index 2036c577..4eaf8d3a 100644
--- a/urls.py
+++ b/urls.py
@@ -30,8 +30,6 @@ urlpatterns += patterns('public.views',
         {}, 'page-about'),
     (r'^art/$', RedirectView.as_view(url='https://projects.parabola.nu/artwork.git/'),
         {}, 'page-art'),
-    (r'^https/$', TemplateView.as_view(template_name='public/https.html'),
-        {}, 'page-https'),
     (r'^donate/$', RedirectView.as_view(url='https://wiki.parabola.nu/Donations'),
         {}, 'page-donate'),
     (r'^download/$', RedirectView.as_view(url='https://wiki.parabola.nu/Get_Parabola'),