Merge branch 'master' of 37rcg4c72i5eckbf.onion:jayvii.de/www

JayVii · Mar 31, 2019 · e516576 · e516576
2 parents 423a23f + de02e9c
commit e516576
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/error.html b/error.html
@@ -2,6 +2,11 @@
      SPDX-License-Identifier: GPL-3.0
 //-->
 
+<!-- Requires following option in Apache2:
+  ErrorDocument 404 /error.html
+//-->
+
+
 <!DOCTYPE html>
 <html>
 
@@ -20,12 +25,12 @@
     <div class="header -invertColor"><!--header-{{{-->
       <div id="headline">
 	<a href="." id="headline">JV//</a>
-	<a href="mailto:jayviiATposteoDOTde" id="headline" class="navbar"><img src="./media/email.svg" class="navbar" alt="Mail"></a>
-	<a href="https://twitter.com/JayVii_de" id="headline" class="navbar"><img src="./media/twitter.svg" class="navbar" alt="Twitter"></a>
-	<a href="https://mastodon.social/@JayVii_de" id="headline" class="navbar"><img src="./media/mastodon.svg" class="navbar" alt="Fediverse"></a>
-	<a href="/git" id="headline" class="navbar"><img src="./media/jv_git.svg" class="navbar" alt="Git"></a>
-	<a href="/git/jayvii.de-www/tree/master/LICENSES" id="headline" class="navbar"><img src="./media/scale-balance.svg" class="navbar" alt="License"></a>
-	<a href="/git/jayvii.de-www" id="headline" class="navbar"><img src="./media/source-branch.svg" class="navbar" alt="Source"></a>
+	<a href="mailto:jayviiATposteoDOTde" id="headline" class="navbar"><img src="/media/email.svg" class="navbar" alt="Mail"></a>
+	<a href="https://twitter.com/JayVii_de" id="headline" class="navbar"><img src="/media/twitter.svg" class="navbar" alt="Twitter"></a>
+	<a href="https://mastodon.social/@JayVii_de" id="headline" class="navbar"><img src="/media/mastodon.svg" class="navbar" alt="Fediverse"></a>
+	<a href="/git" id="headline" class="navbar"><img src="/media/jv_git.svg" class="navbar" alt="Git"></a>
+	<a href="/git/jayvii.de-www/tree/master/LICENSES" id="headline" class="navbar"><img src="/media/scale-balance.svg" class="navbar" alt="License"></a>
+	<a href="/git/jayvii.de-www" id="headline" class="navbar"><img src="/media/source-branch.svg" class="navbar" alt="Source"></a>
       </div>
     </div><!--header-}}}-->
 
@@ -44,7 +49,3 @@ <h3>Oops!</h3>
   </body>
 
 </html>
-
-<!-- Requires following option in Apache2:
-  ErrorDocument 404 /error.html
-//-->
diff --git a/js/force_ssl.js b/js/force_ssl.js
@@ -0,0 +1,11 @@
+// Copyright (c) 2018 Jan "JayVii" <jayvii@posteo.de>
+// SPDX-License-Identifier: GPL-3.0
+
+// Disclaimer:
+// This is necessary, because jayvii.de is not distributed through apache
+// directly, but rather through a proxy-service.
+
+// if protocol is http, use https!
+if (window.location.protocol == "http"){
+    window.location.href = "https" + window.location.href.slice(4);
+}