Neshweb-Sites/main-site
Neshweb-Sites/main-site
1
0
Fork 0
Code Issues 2 Pull requests Releases 9 Packages Activity Actions

Merge Fixes

Browse source
This commit is contained in:
Neshura 2023-03-15 18:47:25 +01:00
parent 3f077029c6
commit fa0b4f59b0
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
1 changed files with 2 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
public/data/pages.json
View file

@ -3,14 +3,9 @@
{
"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",
@ -19,20 +14,11 @@
"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": "kavita",
"location": "tower-0"
@ -51,12 +37,8 @@
{
"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",
@ -66,12 +48,8 @@
{
"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",
@ -162,29 +140,7 @@
"warn": "Note: Admin Only",
"type": "docker",
"docker_container_name": "nginx-prox",
<<<<<<< HEAD:public/pages.json
"location": "brr7-4800u"
},
{
"name": "Grafana",
"icon": "/icons/grafana-logo.svg",
"href": "https://monitoring.neshweb.net/",
"desc1": "Server Monitoring",
"desc": "Server Monitoring Utility",
"warn": "Note: Admin Only",
"type": "docker",
"docker_container_name": "grafana",
"location": "brr7-4800u"
},
{
"name": "Matomo",
"href": "https://tracking.neshweb.net/",
"desc1": "Traffic Monitoring",
"desc": "Traffic Tracking Utility",
"warn": "Note: Admin Only",
"type": "docker",
"docker_container_name": "matomo-web",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Debug1",
@ -196,7 +152,7 @@
"extName": "Qwant",
"type": "docker",
"docker_container_name": "matomo-web",
"location": "brr7-4800u"
"location": "tower-0"
},
{
"name": "Debug2",
@ -207,8 +163,6 @@
"extName": "Qwant",
"type": "docker",
"docker_container_name": "Debug",
"location": "brr7-4800u"
=======
"location": "tower-0"
},
{
@ -219,7 +173,6 @@
"warn": "Note: Admin Only",
"type": "app",
"location": ""
>>>>>>> main:public/data/pages.json
}
],
"games": {