Merge branch 'main' into rework/cards

This commit is contained in:
Neshura 2023-03-15 18:44:55 +01:00
commit 3f077029c6
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
13 changed files with 166 additions and 172 deletions

View file

@ -9,8 +9,8 @@
"href": "/about"
},
{
"name": "Games",
"href": "/games"
"name": "Servers",
"href": "/servers"
},
{
"name": "Services",

View file

@ -3,26 +3,39 @@
{
"name": "Nextcloud",
"icon": "/icons/nextcloud-logo.svg",
<<<<<<< HEAD:public/pages.json
"href": "https://nextcloud.neshweb.net/",
"desc1": "Cloud Storage",
"desc": "Self-hosted Cloud Storage Service but longer and hopefully with wrap as well as some extra just to make sure",
=======
"href": "https://nextcloud.neshweb.net",
"desc": "Self-hosted Cloud Storage Service",
>>>>>>> main:public/data/pages.json
"warn": "Note: Registration requires approval",
"extLink": "https://qwant.com",
"extName": "Qwant",
"type": "docker",
"docker_container_name": "nextcloud",
"location": "brr7-4800u"
"location": "tower-0"
},
{
<<<<<<< HEAD:public/pages.json
"name": "Komga",
"icon": "/icons/komga-logo.png",
"href": "https://komga.neshweb.net/",
"desc1": "Manga/Comics",
"desc": "Self-hosted Comic Library",
"warn": "Note: Registration only via Admin",
=======
"name": "Kavita",
"icon": "/icons/kavita-logo.svg",
"href": "https://kavita.neshweb.net",
"desc": "Self-hosted Manga Library",
"warn": "Registration via Admin invite",
>>>>>>> main:public/data/pages.json
"type": "docker",
"docker_container_name": "komga",
"location": "brr7-4800u"
"docker_container_name": "kavita",
"location": "tower-0"
},
{
"name": "Calibre Web",
@ -31,30 +44,50 @@
"desc1": "eBooks",
"desc": "Self-hosted Ebook Library Service",
"warn": "Note: Registration only via Admin",
"type": "app",
"location": "brr7-4800u"
"type": "docker",
"docker_container_name": "calibre-web",
"location": "tower-0"
},
{
"name": "PeerTube",
"icon": "/icons/peertube-logo.svg",
<<<<<<< HEAD:public/pages.json
"href": "https://tube.neshweb.net/",
"desc1": "Video Platform",
=======
"href": "https://tube.neshweb.net",
>>>>>>> main:public/data/pages.json
"desc": "Self-hosted PeerTube Instance",
"warn": "Note: Registration only via Admin",
"type": "docker",
"docker_container_name": "peertube",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Mastodon",
"icon": "/icons/mastodon-logo.svg",
<<<<<<< HEAD:public/pages.json
"href": "https://mastodon.neshweb.net/",
"desc1": "Twitter Alternative",
=======
"href": "https://mastodon.neshweb.net",
>>>>>>> main:public/data/pages.json
"desc": "Self-hosted Mastodon Instance",
"warn": "Note: Registration requires approval",
"type": "docker",
"docker_container_name": "mastodon-web",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Vaultwarden",
"icon": "/icons/vaultwarden-logo.svg",
"href": "https://vault.neshweb.net",
"desc": "Self-hosted Password Manager",
"warn": "Note: Invite only",
"type": "docker",
"docker_container_name": "vaultwarden",
"location": "tower-0"
},
{
"name": "File Browser",
@ -64,7 +97,7 @@
"warn": "Note: Registration only via Admin",
"type": "docker",
"docker_container_name": "filebrowser",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Jellyfin",
@ -75,7 +108,7 @@
"warn": "Note: Registration only via Admin",
"type": "docker",
"docker_container_name": "jellyfin",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Navidrome",
@ -86,7 +119,7 @@
"warn": "Note: Registration only via Admin",
"type": "docker",
"docker_container_name": "navidrome",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Picard",
@ -96,7 +129,7 @@
"warn": "Note: Access only via Admin",
"type": "docker",
"docker_container_name": "picard",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Gitlab",
@ -107,7 +140,7 @@
"warn": "Note: Registration only via Admin",
"type": "docker",
"docker_container_name": "gitlab",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Portainer",
@ -118,7 +151,7 @@
"warn": "Note: Admin Only",
"type": "docker",
"docker_container_name": "portainer",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Nginx",
@ -129,6 +162,7 @@
"warn": "Note: Admin Only",
"type": "docker",
"docker_container_name": "nginx-prox",
<<<<<<< HEAD:public/pages.json
"location": "brr7-4800u"
},
{
@ -174,6 +208,18 @@
"type": "docker",
"docker_container_name": "Debug",
"location": "brr7-4800u"
=======
"location": "tower-0"
},
{
"name": "Proxmox",
"icon": "/icons/proxmox-logo.png",
"href": "https://proxmox.neshweb.net/",
"desc": "Hypervisor Webinterface",
"warn": "Note: Admin Only",
"type": "app",
"location": ""
>>>>>>> main:public/data/pages.json
}
],
"games": {
@ -194,6 +240,14 @@
"icon": "/icons/zomboid-logo.png",
"ip": "91.13.248.30",
"status": "Online"
},
"factorio": {
"name": "Factorio",
"status": "Online"
},
"space_engineers": {
"name": "Space Engineers",
"status": "Online"
}
}
}