Remove TODOs

Author: Andrew Hobden

_data/subdomains.yml

@@ -260,56 +260,49 @@ hsts-http:
     background: red
     category: Upgrade
     description: |
-        TODO
+        This site advertises HTTP Strict Transport Security however only provides HTTP.
 hsts-https:
     favicon: green
     background: rgb(68, 136, 68)
     category: Upgrade
     description: |
-        TODO
+        This site advertises HTTP Strict Transport Security and correctly provides HTTPS.
 https-everywhere-http:
     favicon: red
     background: rgb(170, 68, 68)
     category: Upgrade
     description: |
-        <i>HTTPS Everywhere</i> does not work or is not enabled.<br>
         This domain will be upgraded to HTTPS if you use <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>.
 https-everywhere-https:
     favicon: green
     background: rgb(68, 136, 68)
     category: Upgrade
     description: |
-        TODO
         This domain will be upgraded to HTTPS if you use <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>.
 preloaded-hsts-http:
     favicon: red
     background: rgb(170, 68, 68)
     category: Upgrade
     description: |
-        TODO
+        This site has preloaded HTTP Strict Transport Security however only provides HTTP.<br>
         Preloaded in: Chrome 44, Firefox 41
 preloaded-hsts-https:
     favicon: green
     background: rgb(68, 136, 68)
     category: Upgrade
     description: |
-        TODO
+        This site has preloaded HTTP Strict Transport Security and correctly provides HTTPS.<br>
         Preloaded in: Chrome 44, Firefox 41
 subdomain.preloaded-hsts:
     favicon: red
     background: red
     category: Upgrade
     description: |
         This site is preloaded to use HTTP Strict Transport Security, but its hostname doesn't match the certificate.
-upgrade-http:
-    favicon: red
-    background: red
-    category: Upgrade
-    description: |
-        TODO
+        Preloaded in: Chrome 44, Firefox 41
 upgrade-https:
     favicon: green
     background: rgb(68, 136, 68)
     category: Upgrade
     description: |
-        TODO
+        This site attempts to load an HTTP image. If upgrade-insecure-requests is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.

domains/upgrade/hsts-http/hsts-http.conf

@@ -8,16 +8,3 @@ server {
 
   root {{ site.serving-path }}/domains/upgrade/hsts-http;
 }
-
-server {
-  listen 443;
-  server_name hsts.{{ site.domain }};
-
-  include {{ site.serving-path }}/nginx-includes/wildcard.normal.conf;
-  include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
-  include {{ site.serving-path }}/common/common.conf;
-
-  add_header Strict-Transport-Security "max-age=15768000; includeSubDomains";
-
-  root {{ site.serving-path }}/domains/upgrade/hsts-https;
-}

domains/upgrade/https-everywhere-http/index.html

@@ -3,6 +3,8 @@
 layout: page
 ---
 
+<i>HTTPS Everywhere</i> does not work or is not enabled.<br>
+
 <div id="content">
   <h1 style="font-size: 7vw;">
     http://{{ page.subdomain }}.<br>{{ site.domain }}