Update for new webserver

input/projects.md

@@ -17,8 +17,8 @@ for p in mpages:
 
 ### Abandoned Projects
 
- * **[avrNetStack](http://xythobuz.de/avrnetstack.html)**
- * **[xyControl](http://xythobuz.de/xycontrol.html)**
- * **[BaconBar](http://xythobuz.de/baconbar/)** Reddit Client ([Softpedia Review](http://mac.softpedia.com/get/Internet-Utilities/BaconBar.shtml))
+ * **[avrNetStack](avrnetstack.html)**
+ * **[xyControl](xycontrol.html)**
+ * **[BaconBar](baconbar)** Reddit Client ([Softpedia Review](http://mac.softpedia.com/get/Internet-Utilities/BaconBar.shtml))
  * **[OpenRaider](https://github.com/xythobuz/OpenRaider)** Free and Open Source classic Tomb Raider game engine
 

input/unlisted/printer.md

@@ -29,12 +29,12 @@ This page contains photos from the Webcams on my 3D printers, live-updated every
 
 <div id="date-1">
     <noscript>
-        <img src="//xythobuz.de/printer.jpg" alt="Fabrikator Mini V1.5">
+        <img src="printer.jpg" alt="Fabrikator Mini V1.5">
     </noscript>
 </div>
 
 <script type="text/javascript">
-    var rt = LastModUsingHeader("//xythobuz.de/printer.jpg", function(i, u) {
+    var rt = LastModUsingHeader("printer.jpg", function(i, u) {
         var img = document.createElement("img");
         img.src = window.URL.createObjectURL(i);
         img.alt = "Fabrikator Mini V1.5";
@@ -54,12 +54,12 @@ This page contains photos from the Webcams on my 3D printers, live-updated every
 
 <div id="date-2">
     <noscript>
-        <img style="transform: rotate(180deg);" src="//xythobuz.de/printer-2.jpg" alt="CTC i3 Pro B">
+        <img style="transform: rotate(180deg);" src="printer-2.jpg" alt="CTC i3 Pro B">
     </noscript>
 </div>
 
 <script type="text/javascript">
-    var rt = LastModUsingHeader("//xythobuz.de/printer-2.jpg", function(i, u) {
+    var rt = LastModUsingHeader("printer-2.jpg", function(i, u) {
         var img = document.createElement("img");
         img.src = window.URL.createObjectURL(i);
         img.alt = "CTC i3 Pro B";

input/unlisted/xycontrol.md

@@ -84,14 +84,14 @@ Everything else is released under a BSD-Style license. See the [accompanying COP
  [xy1]: img/xycontrol1.jpg
  [xy2s]: img/xycontrol2_small.jpg
  [xy2]: img/xycontrol2.jpg
- [gh]: http://www.xythobuz.de/xycontrol/
- [logo]: http://www.xythobuz.de/xycontrol/logo.png
+ [gh]: xycontrol
+ [logo]: xycontrol/logo.png
  [adafruit]: https://github.com/adafruit/Adafruit_L3GD20
  [pololucode]: https://github.com/pololu/LSM303
  [pololu]: http://www.pololu.com/catalog/product/1268
  [ctrl]: http://www.mikrokopter.de/ucwiki/en/BL-Ctrl_V1.2
  [mot]: http://www.conrad.de/ce/de/product/231867
- [bt]: http://xythobuz.de/bluetooth.html
+ [bt]: bluetooth.html
  [kalman]: http://www.linushelgesson.se/2012/04/pitch-and-roll-estimating-kalman-filter-for-stabilizing-quadrocopters/
  [fleury]: http://homepage.hispeed.ch/peterfleury/avr-software.html
  [gpl]: http://www.gnu.org/licenses/gpl.html

macros.py

@@ -7,7 +7,7 @@ import codecs
 from datetime import datetime
 
 DEFAULT_LANG = "en"
-BASE_URL = "http://www.xythobuz.de"
+BASE_URL = "https://www.xythobuz.de"
 
 # -----------------------------------------------------------------------------
 # preconvert hooks
@@ -79,7 +79,7 @@ def hook_preconvert_compat():
     fp = open(os.path.join(options.project, "output", "index.php"), 'w')
     fp.write("<?\n")
     fp.write("// Auto generated xyCMS compatibility index.php\n")
-    fp.write("$loc = 'http://xythobuz.de/index.de.html';\n")
+    fp.write("$loc = 'https://www.xythobuz.de/index.de.html';\n")
     fp.write("if (isset($_GET['p'])) {\n")
     fp.write("    if (isset($_GET['lang'])) {\n")
     fp.write("        $_GET['p'] .= 'EN';\n")
@@ -90,7 +90,7 @@ def hook_preconvert_compat():
             tmp = p["compat"]
             if p.get("lang", DEFAULT_LANG) == DEFAULT_LANG:
                 tmp = tmp + "EN"
-            fp.write(_COMPAT % (tmp, "http://xythobuz.de", p.url))
+            fp.write(_COMPAT % (tmp, "https://www.xythobuz.de", p.url))
             fp.write("\n")
     fp.write(_COMPAT_404 % "/404.html")
     fp.write("    }\n")
@@ -211,7 +211,7 @@ def hook_postconvert_mobilecompat():
     fp = codecs.open(os.path.join(directory, "index.php"), "w", "utf-8")
     fp.write("<?\n")
     fp.write("// Auto generated xyCMS compatibility mobile/index.php\n")
-    fp.write("$loc = 'http://www.xythobuz.de/index.de.html';\n")
+    fp.write("$loc = 'https://www.xythobuz.de/index.de.html';\n")
     fp.write("if (isset($_GET['p'])) {\n")
     fp.write("    if (isset($_GET['lang'])) {\n")
     fp.write("        $_GET['p'] .= 'EN';\n")
@@ -222,7 +222,7 @@ def hook_postconvert_mobilecompat():
             tmp = p["compat"]
             if p.get("lang", DEFAULT_LANG) == DEFAULT_LANG:
                 tmp = tmp + "EN"
-            fp.write(_COMPAT_MOB % (tmp, "http://xythobuz.de", re.sub(".html", ".html", p.url)))
+            fp.write(_COMPAT_MOB % (tmp, "https://www.xythobuz.de", re.sub(".html", ".html", p.url)))
             fp.write("\n")
     fp.write(_COMPAT_404_MOB % "/404.mob.html")
     fp.write("    }\n")

page.html

@@ -12,7 +12,7 @@
     <link type="text/css" rel="stylesheet" href="css/style.css" />
     <link type="text/css" rel="stylesheet" href="css/sh_bright.min.css" />
     <link type="text/css" rel="stylesheet" href="css/gh-fork-ribbon.css" />
-    <link type="text/css" rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700">
+    <link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Droid+Sans:400,700">
     <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/lightgallery/1.2.18/css/lightgallery.min.css" />
     <script type="text/javascript" src="js/sh_main.js"></script>
     <!--%
@@ -51,9 +51,9 @@
                     print(entry % (htmlspecialchars(p["url"]), htmlspecialchars(p["title"])))
             %-->
             <li><a href="https://github.com/xythobuz">GitHub</a></li>
-            <li><a href="http://xythobuz.de/git/">Git</a></li>
-            <li><a href="http://xythobuz.de/lastmusic">🎵</a></li>
-            <li><a href="http://xythobuz.de/printer.html">🔨</a></li>
+            <li><a href="https://git.xythobuz.de/explore/repos">Git</a></li>
+            <li><a href="lastmusic">🎵</a></li>
+            <li><a href="printer.html">🔨</a></li>
             <div class="fonts">
                 <li><span class="font-big">Text:</span></li>
                 <li><a class="dec" href="#"><span class="font-big">A</span><span class="font-small">A</span></a></li>
@@ -169,22 +169,20 @@
             $(".lightgallery").lightGallery(); 
         });
     </script>
-    <img src="http://xythobuz.de/stats/count.php?img" alt="Analytics">
-    <!-- Piwik -->
-    <script type="text/javascript">
-      var _paq = _paq || [];
-      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//xythobuz.de/piwik/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '1']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-    </script>
-    <noscript><p><img src="//xythobuz.de/piwik/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript>
-    <!-- End Piwik Code -->
+    <!-- Fathom - simple website analytics - https://github.com/usefathom/fathom -->
+    <script>
+        (function(f, a, t, h, o, m){
+            a[h]=a[h]||function(){
+                (a[h].q=a[h].q||[]).push(arguments)
+        	};
+			o=f.createElement('script'),
+			m=f.getElementsByTagName('script')[0];
+			o.async=1; o.src=t; o.id='fathom-script';
+			m.parentNode.insertBefore(o,m)
+		})(document, window, '//stats.xythobuz.de/tracker.js', 'fathom');
+		fathom('set', 'siteId', 'APYRK');
+		fathom('trackPageview');
+	</script>
+	<!-- / Fathom -->
 </body>
 </html>