diff --git a/KleinDocs.tree b/KleinDocs.tree
index eed4bdc..a937ba2 100644
--- a/KleinDocs.tree
+++ b/KleinDocs.tree
@@ -7,26 +7,26 @@
start-page="FrontPage.md">
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -35,15 +35,15 @@
-
+
-
+
-
+
@@ -59,4 +59,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/FrontPage.md b/topics/FrontPage.md
index 10c9b75..07122a8 100644
--- a/topics/FrontPage.md
+++ b/topics/FrontPage.md
@@ -13,15 +13,15 @@ Select the subject you're looking for in the left menu bar, or use the [](#short
| Shortcut to page | Shortcut to page | Shortcut to page |
|-----------------------------------|--------------------------|----------------------------------|
-| [](Apps.md) | [](KleinServer.md) | [](Remote-Wireshark-on-Linux.md) |
-| [](CloudflareConfig.md) | [](KleinSense.md) | [](Routers.md) |
-| [](Documents.md) | [](KleinOps.md) | [](Router-addresses.md) |
+| [](Apps_frontpage.md) | [](KleinServer.md) | [](Remote-Wireshark-on-Linux.md) |
+| [](CloudflareConfig.md) | [](KleinSense.md) | [](Routers_frontpage.md) |
+| [](Documents.md) | [](KleinOps_frontpage.md) | [](Router-addresses.md) |
| [](Endpoints.md) | [](KleinHole.md) | [](Server-addresses.md) |
-| [](Familie-Klein-foto-archief.md) | [](Media.md) | [](Servers.md) |
-| [](Github.md) | [](Network.md) | [](SSH-keys.md) |
-| [](Home_automation.md) | [](Networking.md) | [](Switch-addresses.md) |
-| [](HomeAssistant.md) | [](OS.md) | [](ToDo.md) |
-| [](KleinArchives.md) | [](Other.md) | [](Wazuh.md) |
+| [](Familie-Klein-foto-archief.md) | [](Media.md) | [](Servers_frontpage.md) |
+| [](Gitea.md) | [](Network_frontpage.md) | [](SSH-keys.md) |
+| [](Home_automation_frontpage.md) | [](Networking.md) | [](Switch-addresses.md) |
+| [](HomeAssistant.md) | [](OS_frontpage.md) | [](ToDo.md) |
+| [](KleinArchives.md) | [](Other_frontpage.md) | [](Wazuh.md) |
| [](Klein-Familiearchief.md) | [](Overview.md) | [](Windows.md) |
| [](Linux.md) | [](Paperless-gebruik.md) | |
diff --git a/topics/KleinOps/KleinOps.md b/topics/KleinOps/KleinOps_frontpage.md
similarity index 100%
rename from topics/KleinOps/KleinOps.md
rename to topics/KleinOps/KleinOps_frontpage.md
diff --git a/topics/KleinOps/apps/Apps_frontpage.md b/topics/KleinOps/apps/Apps_frontpage.md
new file mode 100644
index 0000000..107de96
--- /dev/null
+++ b/topics/KleinOps/apps/Apps_frontpage.md
@@ -0,0 +1,8 @@
+
+
+# Apps
+These pages contain a description of important apps in use on our local network.
+## ___________________
+
+Shortcut to pages overview
+
diff --git a/topics/KleinOps/apps/Gitea.md b/topics/KleinOps/apps/Gitea.md
new file mode 100644
index 0000000..d8b4974
--- /dev/null
+++ b/topics/KleinOps/apps/Gitea.md
@@ -0,0 +1,17 @@
+
+
+# Gitea (KleinGit)
+Gitea enables the creation and management of repositories based on Git.
+## ___________________
+### Access through
+[](https://gitea.kleinsense.nl/)
+[](http://192.168.1.2:3000/)
+
+### Current projects on Gitea.
+[](https://gitea.kleinsense.nl/klein-projects/KleinDocs)
+[](https://gitea.kleinsense.nl/HU-Projects/pid-balancer)
+[](https://gitea.kleinsense.nl/klein-projects/wazuh-notify)
+
+
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Github.md b/topics/KleinOps/apps/Github.md
deleted file mode 100644
index 6081aea..0000000
--- a/topics/KleinOps/apps/Github.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# GitHub
-
-Checkout our projects on GitHub
-## ___________________
-
-[KleinProjects environment](https://github.com/KleinProjects)
-[DariusKlein projects environment](https://github.com/DariusKlein)
-[RudiKlein projects environment](https://github.com/RudiKlein)
-
-[GitHub Status](https://www.githubstatus.com/)
-
-Shortcuts to pages
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Immich.md b/topics/KleinOps/apps/Immich.md
new file mode 100644
index 0000000..2a93477
--- /dev/null
+++ b/topics/KleinOps/apps/Immich.md
@@ -0,0 +1,16 @@
+
+
+# Immich
+Self-hosted photo and video management. Runs on KleinNAS as a VM-based application offered by the TrueNAS repo.
+## ___________________
+
+### Login through
+[](https://photo.kleinwizard.nl/photos) or
+[](http://192.168.1.150:30041)
+
+Or through the TrueNAS interface
+
+[](http://192.168.1.150)
+[](https://nas.kleinsense.nl)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Netdata.md b/topics/KleinOps/apps/Netdata.md
new file mode 100644
index 0000000..49f66a9
--- /dev/null
+++ b/topics/KleinOps/apps/Netdata.md
@@ -0,0 +1,11 @@
+
+
+# Netdata (KleinSense)
+Netdata is a distributed real-time, health monitoring platform for systems, hardware, containers & applications,
+collecting metrics. It monitors: KleinHole, KleinServer, KleinNAS, KleinNext and KleinPVE (pve, Proxmox)
+## ___________________
+### Access through
+[](https://netdata.kleinsense.nl)
+[](http://192.168.1.1:19999/)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/OPNsense.md b/topics/KleinOps/apps/OPNsense.md
new file mode 100644
index 0000000..980035d
--- /dev/null
+++ b/topics/KleinOps/apps/OPNsense.md
@@ -0,0 +1,11 @@
+
+
+# OPNsense (kleinSense)
+Open Source network routing software that handles all the network traffic. It includes a firewall,
+reverse-proxy server (nginx) and DHCP (Kea).
+## ___________________
+### Access through
+[](https://opnsense.kleinsense.nl)
+[](http://192.168.1.200:8001/)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Portainer.md b/topics/KleinOps/apps/Portainer.md
new file mode 100644
index 0000000..b3718c8
--- /dev/null
+++ b/topics/KleinOps/apps/Portainer.md
@@ -0,0 +1,11 @@
+
+
+# Portainer (KleinServer)
+Portainer is our container management software to deploy, troubleshoot, and secure applications across our homelab.
+## ___________________
+### Access through
+
+[](https://portainer.kleinsense.nl)
+[](https://192.168.1.200:9443/)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Proxmox.md b/topics/KleinOps/apps/Proxmox.md
new file mode 100644
index 0000000..1a2e950
--- /dev/null
+++ b/topics/KleinOps/apps/Proxmox.md
@@ -0,0 +1,10 @@
+
+
+# Proxmox
+Open Source network routing software that handles all the network traffic. It includes a firewall,
+reverse-proxy server (nginx) and DHCP (Kea).
+## ___________________
+### Access through
+[](http://192.168.1.3:8006/)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/TrueNAS_Scale.md b/topics/KleinOps/apps/TrueNAS_Scale.md
new file mode 100644
index 0000000..99fc971
--- /dev/null
+++ b/topics/KleinOps/apps/TrueNAS_Scale.md
@@ -0,0 +1,11 @@
+
+
+# TrueNAS Scale
+TrueNAS® SCALE is an Open Source NAS Infrastructure solution. In addition to powerful scale-out storage capabilities,
+SCALE adds Linux Containers and VMs (KVM)
+## ___________________
+### Access through
+[](http://192.168.1.150)
+[](https://nas.kleinsense.nl)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Containerrr.md b/topics/KleinOps/apps/Watchtower_Containerrr.md
similarity index 72%
rename from topics/KleinOps/apps/Containerrr.md
rename to topics/KleinOps/apps/Watchtower_Containerrr.md
index 87e63e6..0879747 100644
--- a/topics/KleinOps/apps/Containerrr.md
+++ b/topics/KleinOps/apps/Watchtower_Containerrr.md
@@ -5,3 +5,5 @@
A container-based solution for automating Docker container base image updates.
## ___________________
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Wazuh.md b/topics/KleinOps/apps/Wazuh.md
index d85bcae..eb88ae1 100644
--- a/topics/KleinOps/apps/Wazuh.md
+++ b/topics/KleinOps/apps/Wazuh.md
@@ -1,11 +1,14 @@
-# Wazuh
+# Wazuh (KleinServer)
-Endpoint and Cloud Workload Protection
+Open Source Endpoint and Cloud Workload Protection platform that reports potential security threaths.
Wazuh unifies historically separate functions into a single agent and platform architecture.
Protection is provided for public clouds, private clouds, and on-premise data centers.
## ___________________
+### Access through
+[](https://wazuh.kleinwizard.nl)
+[](https://192.168.1.2/)
### Troubleshooting
@@ -84,4 +87,4 @@ $ systemctl restart wazuh-indexer
$ systemctl restart wazuh-dashboard
```
-Shortcuts to pages
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/network/CloudflareConfig.md b/topics/KleinOps/network/CloudflareConfig.md
index 86d6b3b..696393c 100644
--- a/topics/KleinOps/network/CloudflareConfig.md
+++ b/topics/KleinOps/network/CloudflareConfig.md
@@ -11,6 +11,9 @@ The cloud environment used to protect and enhance our local network, and provide
| Type | Target | IP address | Mode |
|------|----------------|-------------------------|----------|
| A | docker | 77.174.236.10 | DNS_only |
+| A | photo | 77.174.236.10 | DNS_only |
+| A | tools | 77.174.236.10 | DNS_only |
+| A | dashboard | 77.174.236.10 | DNS_only |
| CAA | kleinwizard.nl | 0 issue letsencrypt.org | DNS_only |
| A | kleindocs | 77.174.236.10 | DNS_only |
| A | docs | 77.174.236.10 | DNS_only |
@@ -24,12 +27,13 @@ The cloud environment used to protect and enhance our local network, and provide
| Type | Target | IP address | Mode |
|------|---------------|-------------------------|----------|
+| A | dashboard | 77.174.236.10 | DNS_only |
| A | docker | 77.174.236.10 | DNS_only |
| A | docs.notifier | 77.174.236.10 | DNS_only |
| A | kleinsense.nl | 77.174.236.10 | DNS_only |
| A | gitea | 77.174.236.10 | DNS_only |
| A | nas | 77.174.236.10 | DNS_only |
-| A | netboot | 77.174.236.10 | DNS_only |
+| A | tools | 77.174.236.10 | DNS_only |
| A | netdata | 77.174.236.10 | DNS_only |
| A | opnsense | 77.174.236.10 | DNS_only |
| A | pihole | 77.174.236.10 | DNS_only |
@@ -54,6 +58,7 @@ The cloud environment used to protect and enhance our local network, and provide
| A | dariusklein.nl | 77.174.236.10 | DNS only |
| A | db.viseh | 145.89.192.108 | DNS only |
| A | dev | 77.174.236.10 | DNS only |
+| A | git | 77.174.236.10 | DNS only |
| A | docker | 77.174.236.10 | Proxied |
| A | docs.kleincord | 77.174.236.10 | DNS only |
| A | docs.portfolio | 77.174.236.10 | DNS only |
diff --git a/topics/KleinOps/network/Endpoints.md b/topics/KleinOps/network/Endpoints.md
index 46e1ce5..19515ac 100644
--- a/topics/KleinOps/network/Endpoints.md
+++ b/topics/KleinOps/network/Endpoints.md
@@ -2,11 +2,11 @@
# Endpoint addresses
-This page contains most endpoints in use on our local network.
+This page contains most endpoints in use on our local network. (DUPLICATE OF APPS!!)
## ___________________
### opnsense (KleinSense)
-[](https://opnsense.kleinwizard.nl)
-[](http://192.168.178.1:8001/)
+[](https://opnsense.kleinsense.nl)
+[](http://192.168.1.200:8001/)
### wazuh (KleinServer)
[](https://wazuh.kleinwizard.nl)
[](https://192.168.1.2/)
@@ -19,4 +19,13 @@ This page contains most endpoints in use on our local network.
### portainer (KleinServer)
[](https://portainer.kleinsense.nl)
[](https://192.168.1.200:9443/)
+### Gitea
+https://gitea.kleinsense.nl/
+http://192.168.1.2:3000/
+### Immich
+https://photo.kleinwizard.nl/photos
+http://192.168.1.150:30041
+### Truenas
+http://192.168.1.150
+https://nas.kleinsense.nl
Shortcuts to pages
diff --git a/topics/KleinOps/network/Network.md b/topics/KleinOps/network/Network_frontpage.md
similarity index 100%
rename from topics/KleinOps/network/Network.md
rename to topics/KleinOps/network/Network_frontpage.md
diff --git a/topics/KleinOps/network/Nginx-configuration.md b/topics/KleinOps/network/Nginx-configuration.md
index 2a0290f..2d8c92d 100644
--- a/topics/KleinOps/network/Nginx-configuration.md
+++ b/topics/KleinOps/network/Nginx-configuration.md
@@ -29,4 +29,8 @@
| wazuh.kleinsense.nl | wazuh (kleinserver) | kleinsense.nl | kleinserver (wazuh) | 192.168.1.200 | 3010 |
| kleinwizard.nl | kleinwizard | kleinwizard.nl | kleinwizard (home assistant) | 192.168.178.53 | 8123 |
| www.kleinwizard.nl | kleinwizard | kleinwizard.nl | kleinwizard (home assistant) | 192.168.178.53 | 8123 | | | | | | |
-| nas.kleinsense.nl | kleinnas (nas) | kleinsense.nl | kleinnas (nas) | 192.168.1.150 | 443 |
\ No newline at end of file
+| nas.kleinsense.nl | kleinnas (nas) | kleinsense.nl | kleinnas (nas) | 192.168.1.150 | 443 |
+| tools.kleinsense.nl | tools (kleinserver) | kleinsense.nl | kleinserver (tools) | 192.168.1.200 | 4020 |
+| dashboard.kleinsense.nl | dashbaord (kleinserver) | kleinsense.nl | kleinserver (dashbaord) | 192.168.1.200 | 8020 |
+| tools.kleinwizard.nl | tools (kleinserver) | kleinwizard.nl | kleinserver (tools) | 192.168.1.200 | 4020 |
+| dashboard.kleinwizard.nl | dashboard (kleinserver) | kleinwizard.nl | kleinserver (dashboard) | 192.168.1.200 | 8020 |
\ No newline at end of file
diff --git a/topics/KleinOps/network/Overview.md b/topics/KleinOps/network/Overview.md
index 8cec8d9..566d1cb 100644
--- a/topics/KleinOps/network/Overview.md
+++ b/topics/KleinOps/network/Overview.md
@@ -21,8 +21,8 @@ Endpoint and Cloud Workload Protection
Wazuh unifies historically separate functions into a single agent and platform architecture.
Protection is provided for public clouds, private clouds, and on-premise data centers.
-[](https://wazuh.kleinwizard.nl)
-[](https://192.168.1.2/)
+[](https://wazuh.kleinsense.nl)
+[](https://192.168.1.200/)
__*[home assistant](https://www.home-assistant.io/)*__
Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers
@@ -49,7 +49,7 @@ specific Kubernetes distro.
*Endpoints:*
[](https://portainer.kleinsense.nl)
-[](https://192.168.1.2:9443/)
+[](https://192.168.1.200:9443/)
__*[Watchtower (Containerrr)](https://containrrr.dev/watchtower/)*__
*Endpoints:*
diff --git a/topics/KleinOps/network/Server-addresses.md b/topics/KleinOps/network/Server-addresses.md
index d2940f4..8b45721 100644
--- a/topics/KleinOps/network/Server-addresses.md
+++ b/topics/KleinOps/network/Server-addresses.md
@@ -23,7 +23,19 @@ TYPE: Linux server
URL: http://kleinserver.kleinnet
IP : 192.168.1.200
MAC: f0:1f:af:d4:25:d4
-LOC: meterkast
+LOC: bureau Rudi
+HW: PC
+OS: ProxMox
+
+```
+### KleinNas
+{#kleinserver}
+```
+TYPE: Truenas
+URL: http://192.168.1.150
+IP : 192.168.1.150
+MAC: f0:1f:af:d4:25:d4
+LOC: bureau Rudi
HW: PC
OS: ProxMox
diff --git a/topics/KleinOps/os/OS.md b/topics/KleinOps/os/OS_frontpage.md
similarity index 100%
rename from topics/KleinOps/os/OS.md
rename to topics/KleinOps/os/OS_frontpage.md
diff --git a/topics/KleinOps/other/Other.md b/topics/KleinOps/other/Other_frontpage.md
similarity index 100%
rename from topics/KleinOps/other/Other.md
rename to topics/KleinOps/other/Other_frontpage.md
diff --git a/topics/KleinOps/home_automation/Home_automation.md b/topics/KleinOps/power_grid/EV/EV_frontpage.md
similarity index 55%
rename from topics/KleinOps/home_automation/Home_automation.md
rename to topics/KleinOps/power_grid/EV/EV_frontpage.md
index 77600e8..05203bd 100644
--- a/topics/KleinOps/home_automation/Home_automation.md
+++ b/topics/KleinOps/power_grid/EV/EV_frontpage.md
@@ -1,8 +1,8 @@
-# Home automation
+# EV
-These pages provide information on our local home automation platform.
+These pages provide information on our EV (and battery).
## ___________________
Shortcuts to pages
\ No newline at end of file
diff --git a/topics/Energy-Sockets.md b/topics/KleinOps/power_grid/home_automation/Energy-Sockets.md
similarity index 100%
rename from topics/Energy-Sockets.md
rename to topics/KleinOps/power_grid/home_automation/Energy-Sockets.md
diff --git a/topics/KleinOps/home_automation/HomeAssistant.md b/topics/KleinOps/power_grid/home_automation/HomeAssistant.md
similarity index 100%
rename from topics/KleinOps/home_automation/HomeAssistant.md
rename to topics/KleinOps/power_grid/home_automation/HomeAssistant.md
diff --git a/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md b/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md
new file mode 100644
index 0000000..1f87984
--- /dev/null
+++ b/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md
@@ -0,0 +1,8 @@
+
+
+# Power grid
+
+These pages provide information on our Power grid.
+## ___________________
+
+Shortcuts to pages
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/solar/Solar_frontpage.md b/topics/KleinOps/power_grid/solar/Solar_frontpage.md
new file mode 100644
index 0000000..f9159c9
--- /dev/null
+++ b/topics/KleinOps/power_grid/solar/Solar_frontpage.md
@@ -0,0 +1,8 @@
+
+
+# Solar
+
+These pages provide information on our solar system.
+## ___________________
+
+Shortcuts to pages
\ No newline at end of file
diff --git a/topics/KleinOps/routers/Routers.md b/topics/KleinOps/routers/Routers_frontpage.md
similarity index 100%
rename from topics/KleinOps/routers/Routers.md
rename to topics/KleinOps/routers/Routers_frontpage.md
diff --git a/topics/KleinOps/apps/Apps.md b/topics/KleinOps/security/Security_frontpage.md
similarity index 53%
rename from topics/KleinOps/apps/Apps.md
rename to topics/KleinOps/security/Security_frontpage.md
index 1cc74a3..5e9efad 100644
--- a/topics/KleinOps/apps/Apps.md
+++ b/topics/KleinOps/security/Security_frontpage.md
@@ -1,8 +1,10 @@
+# Security
-# Apps
-Application pages with information about locally hosted apps
+Security overview
+Contains security tooling, management and monitoring information
## ___________________
Shortcuts to pages
+in
\ No newline at end of file
diff --git a/topics/KleinOps/servers/Servers.md b/topics/KleinOps/servers/Servers_frontpage.md
similarity index 100%
rename from topics/KleinOps/servers/Servers.md
rename to topics/KleinOps/servers/Servers_frontpage.md