Merge branch 'master' of cubieserver.de:Cubieserver/www

Conflicts:
	software.json
master
Jack Henschel 7 years ago
commit b9be39399d
  1. 4
      index.html
  2. 13
      software.json

@ -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)

@ -2,33 +2,34 @@
[
{
"name":"Linux",
"version":"4.3.3-sunxi",
"version":"4.4",
"status":"Online",
"description":"Kernel"
},
{
"name":"Debian GNU/Linux",
"version":"Jessie (Stable)",
"version":"Jessie 8.3 (Stable)",
"status":"Online",
"description":"Operating System"
},
{
"name":"Nginx",
"version":"1.9.10",
"version":"1.9",
"status":"Online",
"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",
"version":"5.5",
"status":"Online",
"description":"SQL Database Server"},
"description":"MySQL Database Server"
},
{
"name":"Redis",
"version":"3.0",

Loading…
Cancel
Save