From 34adbf77130ca85bc1f0300e41bd63468ea4f5e9 Mon Sep 17 00:00:00 2001
From: Jack Henschel <jh@openmailbox.org>
Date: Thu, 10 Mar 2016 23:52:28 +0100
Subject: [PATCH] Hardcoded Software Information in software.json

---
 index.html    |  4 ++--
 main.js       |  2 +-
 software.json | 44 +++++++++++++++-----------------------------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/index.html b/index.html
index 05bc1a6..b029c45 100644
--- a/index.html
+++ b/index.html
@@ -80,8 +80,8 @@
                 have the ability to use either <a href="https://www.mysql.com/">MySQL</a> or
                 <a href="https://sqlite.org/">SQLite</a> as their storage backend.
                 </section>
-                <section id="chat-servers">
-<!--                <h3> Chat Servers </h3>
+<!--                <section id="chat-servers">
+                <h3> Chat Servers </h3>
                 There are two chat-protocols deployed on Cubieserver.de: IRC and XMPP/Jabber.
                 Of course, both of them are secured and only accessible with SSL.
                 The IRC-Server is <a href="http://ircd-hybrid.org/">ircd-hybrid</a> (Port 6697)
diff --git a/main.js b/main.js
index fe53b61..4c16e38 100644
--- a/main.js
+++ b/main.js
@@ -136,7 +136,7 @@ function requestSoftware() {
             document.getElementById("software_table_wrapper").style.display = "block";
         }
     };
-    request.open("GET", "cgi/software.cgi", true);
+    request.open("GET", "software.json", true);
     request.send();
 }
 
diff --git a/software.json b/software.json
index 2c81d71..8f3c470 100644
--- a/software.json
+++ b/software.json
@@ -1,52 +1,38 @@
+
 [
     {
         "name":"Linux",
-        "version":"3.4.105-cubieboard",
-        "status":"Online"
-        ,"description":"Kernel"
+        "version":"4.4",
+        "status":"Online",
+        "description":"Kernel"
     },
     {
         "name":"Debian GNU/Linux",
-        "version":"stretch/sid",
+        "version":"Jessie 8.3 (Stable)",
         "status":"Online",
         "description":"Operating System"
     },
     {
         "name":"Nginx",
-        "version":"1.9.3",
+        "version":"1.9",
         "status":"Online",
-        "description":"Web Server"},
+        "description":"Web Server"
+    },
     {
         "name":"PHP5",
-        "version":"5.6.11-1",
+        "version":"5.6",
         "status":"Online",
         "description":"Scripting language run by Fast Process Manager (PHP5-FPM)"
     },
     {
         "name":"MySQL",
-        "version":"Ver 14.14 Distrib 5.5.43",
-        "status":"Online",
-        "description":"SQL Database Server"},
-    {
-        "name":"Memcached",
-        "version":"1.4.24","status":"Online","description":"Memory Caching System"
-    },
-    {
-        "name":"ircd-hybrid",
-        "version":"8.2.7",
+        "version":"5.5",
         "status":"Online",
-        "description":"IRC Server"
-    },
-    {
-        "name":"ZNC",
-        "version":"1.6.0",
-        "status":"Online",
-        "description":"IRC Bouncer"
-    },
+        "description":"MySQL Database Server"},
     {
-        "name":"Transmission",
-        "version":"2.84",
-        "status":"Offline",
-        "description":"Torrent Client and Server"
+        "name":"Redis",
+        "version":"3.0",
+	"status":"Online",
+	"description":"Memory Caching System"
     }
 ]