diff --git a/topics/KleinOps/energy/EV/EV_frontpage.md b/topics/KleinOps/energy/EV/EV_frontpage.md
index 14c1608..093bbec 100644
--- a/topics/KleinOps/energy/EV/EV_frontpage.md
+++ b/topics/KleinOps/energy/EV/EV_frontpage.md
@@ -5,4 +5,13 @@
These pages provide information on our EV (and battery).
## ___________________
+
+
+
+
+
+
+## ___________________
+
+
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/energy/home_automation/HomeAssistant.md b/topics/KleinOps/energy/home_automation/HomeAssistant.md
index 96d5f6d..9032ec7 100644
--- a/topics/KleinOps/energy/home_automation/HomeAssistant.md
+++ b/topics/KleinOps/energy/home_automation/HomeAssistant.md
@@ -10,24 +10,36 @@ Home Assistant is the main platform for our local home automation.
[Home Wizard device overview](https://kleinwizard.nl/config/integrations/integration/homewizard)
[Power usage gauges](https://kleinwizard.nl/dashboard-grid/stroomverbruik)
[Energy distribution](https://kleinwizard.nl/dashboard-grid/energy-embeded)
+[Grafana Energy dashboard](https://graph.kleinsense.nl/public-dashboards/caa8dfd119e34a2eb0a16515e98f003b)
### Energy meters overview
-| Meter | Brand | Usage |
-|--------------------------|------------|-----------------|
-| P1 meter (3c39e7285f8c) | Stedin | Grid |
-| Energy Kwh Kia EV3 | HomeWizard | Car |
-| Energy KWh KleinBoil | HomeWizard | Boiler |
-| Energy Kwh KleinFloor | HomeWizard | Floor heating |
-| Energy Kwh KleinRoof | HomeWizard | Home roof solar |
-| Energy Kwh KleinShed | HomeWizard | Shed roof solar |
-| Energy Socket Julius | HomeWizard | Julius |
-| Energy Socket Rolien | HomeWizard | Rolien |
-| Energy Socket Rudi | HomeWizard | Rudi |
-| Energy Socket Serverkast | HomeWizard | Serverkast |
-| Energy Socket Other | HomeWizard | NOT IN USE |
-| Energy Meter 1 Darius | Ikea | Darius |
-| Energy Meter 2 Server | Ikea | Server |
-| Energy Meter 3 Other | Ikea | NOT IN USE |
+| **Device** | **Area** | **Platform** | **Producer** |
+|---------------------------------------------|----------------|-------------------|--------------|
+| **Energy kWh meter Airco** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy kWh Meter Charger** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy kWh meter Fornuis** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy kWh meter KleinBoil** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy kWh meter KleinFloor** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy kWh meter KleinShed** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy Socket Julius** | Zolder | HomeWizard Energy | HomeWizard |
+| **Energy Socket Rolien** | Slaapkamer R/R | HomeWizard Energy | HomeWizard |
+| **Energy Socket Rudi** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy Socket Serverkast** | Meterkast | HomeWizard Energy | HomeWizard |
+| **Energy Socket Vaatwasser** | Keuken | HomeWizard Energy | HomeWizard |
+| **Envoy 122428000926** | Meterkast | Enphase Envoy | Enphase |
+| **IKEA energy meter 1 - Darius** | Slaapkamer D/J | MQTT | IKEA |
+| **IKEA energy meter 2 - Server** | Zolder | MQTT | IKEA |
+| **IKEA energy meter 3 - Droger** | Zolder | MQTT | IKEA |
+| **IKEA energy meter 4 Wasmachine** | Zolder | MQTT | IKEA |
+| **IKEA energy meter 5 Badkamer verwarming** | Badkamer | MQTT | IKEA |
+| **IKEA energy meter 6 Minikoelkast** | Keuken | MQTT | IKEA |
+| **IKEA energy meter 7 Miniboiler** | Keuken | MQTT | IKEA |
+| **IKEA energy meter 8 Airfryer** | Keuken | MQTT | IKEA |
+| **IKEA energy meter 9 Plafond verwarming** | Slaapkamer R/R | MQTT | IKEA |
+| **IKEA energy meter 10 Bureau verwarming** | Slaapkamer R/R | MQTT | IKEA |
+| **IKEA energy meter 11 Bureau Rolien** | Slaapkamer R/R | MQTT | IKEA |
+| **IKEA energy meter 12 - Voetverwarmer** | Zolder | MQTT | IKEA |
+## ___________________
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/CloudflareConfig.md b/topics/KleinOps/network/CloudflareConfig.md
index 1702375..ab4b965 100644
--- a/topics/KleinOps/network/CloudflareConfig.md
+++ b/topics/KleinOps/network/CloudflareConfig.md
@@ -25,56 +25,65 @@ The cloud environment used to protect and enhance our local network, and provide
*__kleinsense.nl__*
-| 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 | 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 |
-| A | wazuh | 77.174.236.10 | DNS_only |
-| A | paperless | 77.174.236.10 | DNS_only |
-| A | flux | 77.174.236.10 | DNS_only |
-| A | graph | 77.174.236.10 | DNS_only |
-| A | kvm1 | 77.174.236.10 | DNS_only |
-| A | kvm2 | 77.174.236.10 | DNS_only |
-| A | portainer | 77.174.236.10 | DNS_only |
-| CAA | kleinsense.nl | 0 issue letsencrypt.org | DNS_only |
-| NS | kleinsense.nl | dom.ns.cloudflare.com | DNS_only |
-| NS | kleinsense.nl | elsa.ns.cloudflare.com | DNS_only |
-| TXT | *._domainkey | v=DKIM1; p= | DNS_only |
-| TXT | kleinsense.nl | v=spf1 -all | DNS_only |
+| **Type** | **Target** | **Value** | **Mode** |
+|----------|---------------|---------------------------------------------------|----------|
+| **A** | blinko | 77.174.236.10 | DNS only |
+| **A** | convert | 77.174.236.10 | DNS only |
+| **A** | dashboard | 77.174.236.10 | DNS only |
+| **A** | desktop | 77.174.236.10 | DNS only |
+| **A** | docker | 77.174.236.10 | DNS only |
+| **A** | docs.notifier | 77.174.236.10 | DNS only |
+| **A** | flux | 77.174.236.10 | DNS only |
+| **A** | gitea | 77.174.236.10 | DNS only |
+| **A** | graph | 77.174.236.10 | DNS only |
+| **A** | kleinkvm1 | 77.174.236.10 | DNS only |
+| **A** | kleinkvm2 | 77.174.236.10 | DNS only |
+| **A** | kleinsense.nl | 77.174.236.10 | DNS only |
+| **A** | kvm1 | 77.174.236.10 | DNS only |
+| **A** | kvm2 | 77.174.236.10 | DNS only |
+| **A** | nas | 77.174.236.10 | DNS only |
+| **A** | netdata | 77.174.236.10 | DNS only |
+| **A** | omv | 77.174.236.10 | DNS only |
+| **A** | opnsense | 77.174.236.10 | DNS only |
+| **A** | paperless | 77.174.236.10 | DNS only |
+| **A** | pihole | 77.174.236.10 | DNS only |
+| **A** | portainer | 77.174.236.10 | DNS only |
+| **A** | proxmox | 77.174.236.10 | DNS only |
+| **A** | speedtest | 77.174.236.10 | DNS only |
+| **A** | ssh.gitea | 77.174.236.10 | DNS only |
+| **A** | tools | 77.174.236.10 | DNS only |
+| **A** | wazuh | 77.174.236.10 | DNS only |
+| **CAA** | kleinsense.nl | 0 issue letsencrypt.org | DNS only |
+| **NS** | kleinsense.nl | dom.ns.cloudflare.com | DNS only |
+| **NS** | kleinsense.nl | elsa.ns.cloudflare.com | DNS only |
+| **TXT** | _dmarc | v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s... | DNS only |
+| **TXT** | *._domainkey | v=DKIM1; p= | DNS only |
+| **TXT** | kleinsense.nl | v=spf1 -all | DNS only |
+
*__dariusklein.nl__*
-| Type | Target | IP address | Mode |
-|------|----------------|------------------------------------------------------------------------|----------|
-| A | api | 77.174.236.10 | DNS only |
-| A | api.portfolio | 77.174.236.10 | DNS only |
-| A | api.viseh | 145.89.192.108 | DNS only |
-| A | appflowy | 77.174.236.10 | DNS only |
-| 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 |
-| A | portfolio | 77.174.236.10 | DNS only |
-| A | test | 77.174.236.10 | DNS only |
-| A | www | 77.174.236.10 | DNS only |
-| CAA | dariusklein.nl | 0 issue letsencrypt.org | DNS only |
-| MX | dariusklein.nl | route3.mx.cloudflare.net | DNS only |
-| MX | dariusklein.nl | route2.mx.cloudflare.net | DNS only |
-| MX | dariusklein.nl | route1.mx.cloudflare.net | DNS only |
-| TXT | dariusklein.nl | "v=spf1 include:_spf.mx.cloudflare.net ~all" | DNS only |
-| TXT | dariusklein.nl | "google-site-verification=KBaq2VgAdOPXB-ABjHW1DeK6iB1mlSC45OdtGEMqyk4" | DNS only |
-
+| **Type** | **Target** | **Value** | **Mode** |
+|----------|---------------------|----------------------------------------------------------------------|----------|
+| **A** | api | 77.174.236.10 | DNS only |
+| **A** | api.portfolio | 77.174.236.10 | DNS only |
+| **A** | dariusklein.nl | 77.174.236.10 | DNS only |
+| **A** | dev | 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 |
+| **A** | git | 77.174.236.10 | DNS only |
+| **A** | portfolio | 77.174.236.10 | DNS only |
+| **A** | test | 77.174.236.10 | DNS only |
+| **A** | www | 77.174.236.10 | DNS only |
+| **CAA** | dariusklein.nl | 0 issue letsencrypt.org | DNS only |
+| **MX** | dariusklein.nl | route3.mx.cloudflare.net (54) | DNS only |
+| **MX** | dariusklein.nl | route2.mx.cloudflare.net (97) | DNS only |
+| **MX** | dariusklein.nl | route1.mx.cloudflare.net (48) | DNS only |
+| **TXT** | cf2024-1._domainkey | v=DKIM1; h=sha256; k=rsa... | DNS only |
+| **TXT** | dariusklein.nl | v=spf1 include:_spf.mx.cloudflare.net ~all | DNS only |
+| **TXT** | dariusklein.nl | google-site-verification=KBaq2VgAdOPXB-ABjHW1DeK6iB1mlSC45OdtGEMqyk4 | DNS only |
+## ___________________
Back to frontpage
diff --git a/topics/KleinOps/network/Network_drawing.md b/topics/KleinOps/network/Network_drawing.md
index 327b22e..ef04cd4 100644
--- a/topics/KleinOps/network/Network_drawing.md
+++ b/topics/KleinOps/network/Network_drawing.md
@@ -1,8 +1,8 @@
# Network drawing
-
-[Network drawing](https://paperless.kleinsense.nl/share/R7wNmc79FFvIzsFSRYlvmlzX4kHhz0cmizFWATtChkJatQtn1h)
+## ___________________
+[Network drawing](https://paperless.kleinsense.nl/share/LV9i44jaZbb1NtvcCSRQJBQ88Bje8Ih5NJUeCQEjanSKCZSVEH)
## ___________________
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/Networking.md b/topics/KleinOps/network/Networking.md
index 335aca7..5abcf38 100644
--- a/topics/KleinOps/network/Networking.md
+++ b/topics/KleinOps/network/Networking.md
@@ -76,5 +76,5 @@ This page contains a large list of Linux networking commands and links to more e
| Wireless Tools for Linux | includes iwconfig, iwlist, iwspy, iwpriv and ifrename. |
| Wireshark | network protocol analyzer. |
-
+## ___________________
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/Nginx-configuration.md b/topics/KleinOps/network/Nginx-configuration.md
index b1117dd..d8d469b 100644
--- a/topics/KleinOps/network/Nginx-configuration.md
+++ b/topics/KleinOps/network/Nginx-configuration.md
@@ -2,42 +2,40 @@
# NGINX configuration OPNsense
-
-| HTTP Servername | Locations | Certificate | Upstream | Upstream server | Port |
-|-------------------------------|---------------------------------|----------------|---------------------------------|-----------------|-------|
-| pihole.kleinsense.nl | pihole (kleinhole) | kleinsense.nl | kleinhole (pihole) | 192.168.178.252 | 80 |
-| photo.kleinwizard.nl | photo (kleinnas) | kleinwizard.nl | kleinnas (photo) | 192.168.1.150 | 30041 |
-| netdata.kleinsense.nl | netdata (kleinsense) | kleinsense.nl | kleinsense (netdata) | 192.168.1.1 | 19999 |
-| opnsense.kleinsense.nl | opnsense (kleinsense) | kleinsense.nl | kleinsense (opnsense) | 192.168.0.254 | 8001 |
-| docker.kleinsense.nl | docker (kleinserver) | kleinsense.nl | kleinserver (docker) | 192.168.1.200 | 5000 |
-| docker.kleinwizard.nl | docker (kleinserver) | kleinwizard.nl | kleinserver (docker) | 192.168.1.200 | 5000 |
-| docker.eria-lifesystems.com | docker (kleinserver) | kleinwizard.nl | kleinserver (docker) | 192.168.1.200 | 5000 |
-| docker.dariusklein.nl | docker (kleinserver) | dariusklein.nl | kleinserver (docker) | 192.168.1.200 | 5000 |
-| docs.kleincord.dariusklein.nl | kleincord docs (kleinserver) | dariusklein.nl | kleinserver (kleincord docs) | 192.168.1.200 | 9090 |
-| gitea.kleinsense.nl | gitea (kleinserver) | kleinsense.nl | kleinserver (gitea) | 192.168.1.200 | 3000 |
-| kleindocs.kleinwizard.nl | kleindocs (kleinserver) | kleinwizard.nl | kleinserver (kleindocs) | 192.168.1.200 | 9092 |
-| docs.notifier.kleinsense.nl | notifier docs (kleinserver) | kleinsense.nl | kleinserver (notifer docs) | 192.168.1.200 | 9091 |
-| paperless.kleinsense.nl | paperless (kleinserver) | kleinsense.nl | kleinserver (paperless) | 192.168.1.200 | 3098 |
-| portainer.kleinsense.nl | portainer (kleinserver) | kleinsense.nl | kleinserver (portainer) | 192.168.1.200 | 8011 |
-| api.portfolio.dariusklein.nl | portfolio backend (kleinserver) | dariusklein.nl | kleinserver (portfolio backend) | 192.168.1.200 | 4001 |
-| api.dariusklein.nl | portfolio backend (kleinserver) | dariusklein.nl | kleinserver (portfolio backend) | 192.168.1.200 | 4001 |
-| dev.dariusklein.nl | portfolio backend (kleinserver) | dariusklein.nl | kleinserver (portfolio backend) | 192.168.1.200 | 4001 |
-| docs.portfolio.dariusklein.nl | portfolio docs (kleinserver) | dariusklein.nl | kleinserver (portfolio docs) | 192.168.1.200 | 4002 |
-| www.dariusklein.nl | portfolio website (kleinserver) | dariusklein.nl | kleinserver (portfolio web) | 192.168.1.200 | 4000 |
-| portfolio.dariusklein.nl | portfolio website (kleinserver) | dariusklein.nl | kleinserver (portfolio web) | 192.168.1.200 | 4000 |
-| dariusklein.nl | portfolio website (kleinserver) | dariusklein.nl | kleinserver (portfolio web) | 192.168.1.200 | 4000 |
-| 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 |
-| 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 |
-| flux.kleinsense.nl | influxdb (kleinserver) | kleinsense.nl | kleinflux (influxdb) | 192.168.1.5 | 8086 |
-| graph.kleinsense.nl | grafana (kleingraph) | kleinsense.nl | kleingraph (grafana) | 192.168.1.6 | 3000 |
-| kvm1.kleinsense.nl | kvm1 (kleinkvm1) | kleinsense.nl | kleinkvm1 (jetkvm1) | 192.168.1.221 | 80 |
-| kvm2.kleinsense.nl | kvm2 (kleinkvm2) | kleinsense.nl | kleinkvm2 (jetkvm2) | 192.168.3.222 | 80 |
-
+| **HTTPS server** | **Locations** | **Upstream** | **Upstream server** | **Port** |
+|------------------------------------------------------------------------|---------------------------------|---------------------------------|---------------------|----------|
+| **blinko.kleinsense.nl** | blinko (klein8s) | klein8s (blinko) | 192.168.1.17 | 11111 |
+| **convert.kleinsense.nl** | convertx (klein8s) | klein8s (convert) | 192.168.1.17 | 13088 |
+| **dashboard.kleinsense.nl** | dashboard (kleinserver) | klein8s (dashboard) | 192.168.1.17 | 18020 |
+| **dashboard.kleinwizard.nl** | dashboard (kleinserver) | klein8s (dashboard) | 192.168.1.17 | 18020 |
+| **graph.kleinsense.nl** | grafana (klein8s) | klein8s (grafana) | 192.168.1.17 | 13000 |
+| **flux.kleinsense.nl** | influxdb (klein8s) | klein8s (influxdb) | 192.168.1.17 | 18086 |
+| **kleindocs.kleinwizard.nl** | kleindocs (klein8s) | klein8s (kleindocs) | 192.168.1.17 | 19092 |
+| **tools.kleinsense.nl** | tools (klein8s) | klein8s (tools) | 192.168.1.17 | 14020 |
+| **tools.kleinwizard.nl** | tools (klein8s) | klein8s (tools) | 192.168.1.17 | 14020 |
+| **pihole.kleinsense.nl** | pihole (kleinhole) | kleinhole1 (pihole1) | 192.168.1.252 | 8080 |
+| **kleinkvm1.kleinsense.nl** | kleinkvm1 (kleinkvm1) | kleinkvm1 (JetKVM) | 192.168.178.221 | 80 |
+| **kleinkvm2.kleinsense.nl** | kleinkvm2 (kleinkvm2) | kleinkvm2 (JetKVM) | 192.168.3.222 | 80 |
+| **kvm1.kleinsense.nl** | kleinkvm1 (kleinkvm1) | kleinkvm1 (JetKVM) | 192.168.178.221 | 80 |
+| **kvm2.kleinsense.nl** | kleinkvm2 (kleinkvm2) | kleinkvm2 (JetKVM) | 192.168.3.222 | 80 |
+| **proxmox.kleinsense.nl** | proxmox (kleinmox1) | kleinmox1 (dashboard) | 192.168.1.3 | 8006 |
+| **nas.kleinsense.nl** | nas (kleinnas) | kleinnas (nas) | 192.168.1.150 | 80 |
+| **photo.kleinwizard.nl** | photo (klein8s) | klein8s (photo) | 192.168.1.17 | 12283 |
+| **omv.kleinsense.nl** | openmediavault (kleinomv) | kleinomv (openmediavault) | 192.168.1.4 | 80 |
+| **netdata.kleinsense.nl** | netdata (kleinsense) | kleinsense (netdata) | 192.168.1.1 | 19999 |
+| **opnsense.kleinsense.nl** | opnsense (kleinsense) | kleinsense (opnsense) | 192.168.0.254 | 8001 |
+| **docker.dariusklein.nl** | docker (kleinserver) | kleinserver (docker) | 192.168.1.200 | 3000 |
+| **docker.kleinwizard.nl,docker.eria-lifesystems.com** | docker (kleinserver) | kleinserver (docker) | 192.168.1.200 | 3000 |
+| **** | | kleinserver (gitea ssh) | 192.168.1.200 | 12222 |
+| **gitea.kleinsense.nl** | gitea (kleinserver) | kleinserver (gitea) | 192.168.1.200 | 3000 |
+| **docs.kleincord.dariusklein.nl** | kleincord docs (kleinserver) | kleinserver (kleincord docs) | 192.168.1.200 | 9090 |
+| **docs.notifier.kleinsense.nl** | notifier docs (kleinserver) | kleinserver (notifier docs) | 192.168.1.200 | 9091 |
+| **paperless.kleinsense.nl** | paperless (kleinserver) | kleinserver (paperless) | 192.168.1.17 | 18002 |
+| **api.portfolio.dariusklein.nl,api.dariusklein.nl,dev.dariusklein.nl** | portfolio backend (kleinserver) | kleinserver (portfolio backend) | 192.168.1.200 | 4001 |
+| **docs.portfolio.dariusklein.nl** | portfolio docs (kleinserver) | kleinserver (portfolio docs) | 192.168.1.200 | 4002 |
+| **www.dariusklein.nl,dariusklein.nl,portfolio.dariusklein.nl** | portfolio website (kleinserver) | kleinserver (portfolio web) | 192.168.1.200 | 4000 |
+| **desktop.kleinsense.nl** | rustdesk (kleinserver) | kleinserver (rustdesk) | 192.168.1.200 | 21116 |
+| **wazuh.kleinsense.nl** | wazuh (kleinserver) | kleinserver (wazuh) | 192.168.1.200 | 3010 |
+| **kleinwizard.nl,www.kleinwizard.nl** | home assistant (kleinwizard) | kleinwizard (home assistant) | 192.168.178.53 | 8123 |
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/kvms/JetKVM-addresses.md b/topics/KleinOps/network/kvms/JetKVM-addresses.md
index 8be5cbe..fd881cf 100644
--- a/topics/KleinOps/network/kvms/JetKVM-addresses.md
+++ b/topics/KleinOps/network/kvms/JetKVM-addresses.md
@@ -3,7 +3,7 @@
# JetKVM addresses
This page contains JetKVM information.
-## ___________________________
+## ___________________
### KleinKVM1
{#kleinkvm1}
@@ -29,4 +29,5 @@ HW: JetKVM
OS: Busybox
```
+## ___________________
Back to frontpage
diff --git a/topics/KleinOps/network/routers/KleinHole.md b/topics/KleinOps/network/routers/KleinHole.md
deleted file mode 100644
index 78c59d1..0000000
--- a/topics/KleinOps/network/routers/KleinHole.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-# KleinHole
-## ___________________
-
-IP/MAC address information
-
-Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/routers/KleinSense.md b/topics/KleinOps/network/routers/KleinSense.md
deleted file mode 100644
index 8732f67..0000000
--- a/topics/KleinOps/network/routers/KleinSense.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-# KleinSense
-
-## ___________________
-
-### Ports
-
-| Config name | IP | Dev port | Phy port | OS name |
-|-------------|-----|----------|----------|---------|
-| WAN | 0 | igc0 | 1 | WAN |
-| LAN | 178 | igc1 | 3 | LAN |
-| SERVER | 1 | igc2 | 2 | OPT1 |
-| UPSTAIRS | 3 | igc3 | 4 | OPT2 |
-
-### Drawings
-```
-https://domain/location/filename
-```
-Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/routers/Router-addresses.md b/topics/KleinOps/network/routers/Router-addresses.md
index 3d4fc11..1590717 100644
--- a/topics/KleinOps/network/routers/Router-addresses.md
+++ b/topics/KleinOps/network/routers/Router-addresses.md
@@ -4,7 +4,7 @@
# Router addresses
{#router-addresses}
This page contains address information about our routers en servers.
-## ___________________________
+## ___________________
### KleinFritz
@@ -34,11 +34,11 @@ OS: Fritz!OS
{#kleinhole}
```
TYPE: DNS server/Ad blocker
-URL: http://kleinhole.kleinnet/admin
-IP: 192.168.178.252/admin
-MAC: e4:5f:01:81:59:73
-LOC: meterkast
-HW: Raspberry Pi
+URL: https://pihole.kleinsense.nl/admin/login
+IP: 192.168.13
+MAC: bc:24:11:63:52:8a
+LOC: zolder
+HW: Proxmox
OS: PiHole
```
### KleinLess
@@ -52,17 +52,7 @@ LOC: meterkast
HW: tp-link AX10
OS: Linux based
```
-### KleinSense
-{#kleinsense}
-```
-TYPE: Router
-URL: http://kleinsense.kleinnet
-IP: 192.168.178.254
-MAC: 60:be:b4:10:27:2c
-LOC: meterkast
-HW:
-OS: OPNsense
-```
+
### KleinWired
{#kleinwired}
```
@@ -72,15 +62,29 @@ IP: 192.168.178.249
MAC: 94:83:c4:4c:1f:6e
LOC: slaapkamer J&D
```
-### KleinServer
-{#kleinserver}
+
+### KleinSense
+{#kleinsense}
```
-TYPE: Linux server
-URL: http://kleinserver.kleinnet
-IP : 192.168.178.1
-MAC: f0:1f:af:d4:25:d4
+TYPE: Router
+URL: http://kleinsense.kleinnet
+IP: 192.168.178.254
+MAC: 60:be:b4:10:27:2c
LOC: meterkast
-HW: Blade
-OS: Linux Mint
+HW: Mini PC
+OS: OPNsense
```
+
+
+#### Ports
+
+| Config name | IP | Dev port | Phy port | OS name |
+|-------------|-----|----------|----------|---------|
+| WAN | 0 | igc0 | 1 | WAN |
+| LAN | 178 | igc1 | 3 | LAN |
+| SERVER | 1 | igc2 | 2 | OPT1 |
+| UPSTAIRS | 3 | igc3 | 4 | OPT2 |
+
+## ___________________
+
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/network/servers/Server-addresses.md b/topics/KleinOps/network/servers/Server-addresses.md
index a67f8ab..ded77b2 100644
--- a/topics/KleinOps/network/servers/Server-addresses.md
+++ b/topics/KleinOps/network/servers/Server-addresses.md
@@ -5,59 +5,65 @@
This page contains server address information.
## ___________________________
-### Preferred port ranges
-
-| Purpose | From | To |
-|--------------------------|------|------|
-| Misc standalone services | 3000 | 3099 |
-| Public Websites | 4000 | 4099 |
-| Backend | 4100 | 4199 |
-| Databases | 5000 | 5099 |
-| Internal web GUI | 8000 | 8099 |
-
### KleinServer
-{#kleinserver}
```
+
TYPE: Linux server
URL: http://kleinserver.kleinnet
IP : 192.168.1.200
MAC: f0:1f:af:d4:25:d4
-LOC: bureau Rudi
+LOC: Zolder
HW: PC
-OS: Ubuntu 22.04 LTS
+OS: Ubuntu 22.04 LTS (on Proxmox)
```
### KleinNas
-{#kleinnas}
+
```
TYPE: Truenas
URL: http://192.168.1.150
IP : 192.168.1.150
MAC: f0:1f:af:d4:25:d4
-LOC: bureau Rudi
+LOC: Zolder
HW: PC
-OS: Truenas Scale
+OS: Truenas Scale (on Proxmox)
-```
-### KleinNext
-{#kleinnext}
-```
-TYPE: Synology NAS
-URL: http://192.168.178.250
-IP : 192.168.178.250
-MAC: 00:11:32:b5:c9:E2
-LOC: Meterkast
-HW: NAS
-OS: Synology DSM
```
### KleinMox1
-{#kleinmox1}
+
```
TYPE: Proxmox server
URL: http://kleinmox1.kleinnet
IP : 192.168.1.3
MAC: e0:d5:5e:24:8e:9d
-LOC: Waskamer
+LOC: Zolder
HW: PC
OS: ProxMox
+```
+### Klein8s
+
+```
+TYPE: Kubernetes server
+URL: http://klein8s.kleinnet
+IP : 192.168.1.17
+MAC: bc:24:11:eb:b3:e6
+LOC: Zolder
+HW: PC
+OS: Ubuntu (on Proxmox)
+
+```
+### KleinOMV
+
+```
+TYPE: openmediavault
+URL: http://kleinomv.kleinnet
+IP : 192.168.1.4
+MAC: 2c:cf:67:44:0b:ae
+LOC: Schuur
+HW: Custom NAS
+OS: openmediavault (Debian)
+```
+## ___________________
+Back to frontpage
+
diff --git a/topics/KleinOps/network/switches/Switch-addresses.md b/topics/KleinOps/network/switches/Switch-addresses.md
index 1682522..94117f8 100644
--- a/topics/KleinOps/network/switches/Switch-addresses.md
+++ b/topics/KleinOps/network/switches/Switch-addresses.md
@@ -6,7 +6,7 @@ This page contains all switch address informatiom.
## ___________________
### KleinSwitch-1 (UPSTAIRS)
-{#kleinswitch-1}
+
[kleinswitch-1](http://192.168.3.8)
```
URL: http://192.168.3.8
@@ -14,7 +14,7 @@ MAC: cc:40:d0:4c:4f:21
LOC: Meterkast
```
### KleinSwitch-2 (UPSTAIRS, Julius)
-{#kleinswitch-2}
+
[kleinswitch-2](http://192.168.3.7)
```
URL: http://192.168.3.7
@@ -22,7 +22,7 @@ MAC: bc:a5:11:c4:73:be
LOC: Julius' kamer
```
### KleinSwitch-3 (LAN)
-{#kleinswitch-3}
+
[kleinswitch-3](http://192.168.178.5)
```
URL: http://192.168.178.5
@@ -30,7 +30,7 @@ MAC: 08:02:8e:97:fe:e9
LOC: Meterkast
```
### KleinSwitch-4 (UPSTAIRS, Darius)
-{#kleinswitch-4}
+
[kleinswitch-4](http://192.168.3.6)
```
URL: http://192.168.3.6
@@ -38,7 +38,7 @@ MAC: bc:a5:11:c4:73:a5
LOC: Darius' kamer
```
### KleinSwitch-5 (LAN)
-{#kleinswitch-5}
+
[kleinswitch-5](http://192.168.178.4)
```
URL: http://192.168.178.4
@@ -46,7 +46,7 @@ MAC: 94:18:65:7c:03:11
LOC: Meterkast
```
### KleinSwitch-6 (LAN, Rudi)
-{#kleinswitch-6}
+
[kleinswitch-6](http://192.168.178.6)
```
URL: http://192.168.178.6
@@ -54,4 +54,5 @@ MAC: 94:18:65:7a:5c:56
LOC: Bureau Rudi
```
+## ___________________
Back to frontpage
\ No newline at end of file
diff --git a/topics/KleinOps/operating_systems/linux/Linux.md b/topics/KleinOps/operating_systems/linux/Linux_frontpage.md
similarity index 100%
rename from topics/KleinOps/operating_systems/linux/Linux.md
rename to topics/KleinOps/operating_systems/linux/Linux_frontpage.md
diff --git a/topics/KleinOps/operating_systems/proxmox/Proxmox.md b/topics/KleinOps/operating_systems/proxmox/Proxmox.md
index b4208fb..a5b0e6d 100644
--- a/topics/KleinOps/operating_systems/proxmox/Proxmox.md
+++ b/topics/KleinOps/operating_systems/proxmox/Proxmox.md
@@ -8,16 +8,14 @@ reverse-proxy server (nginx) and DHCP (Kea).
### Hosts
**Cluster**: KleinMox
- **Host 1**: kleinmox1 (192.168.1.3)
-- **Host 2**: kleinmox2 (192.168.1.4)
+
### VMs
KleinNas (150) TrueNAS Scale
-KleinServer (200) Ubuntu 22.04 LTS
+KleinServer (200) Ubuntu
+Klein8s (250) Ubuntu Kubernetes
+KleinHole1 (103) Pihole
-### LXC
-KleinFlux (101) InfluxDB
-KleinGraph (102) Grafana
-
### Source
Website (https://www.proxmox.com/)
### Access through
@@ -70,5 +68,5 @@ Remove old node information
```
$ rm -r /etc/pve/nodes/pve
```
-
+## ___________________
Back to frontpage
\ No newline at end of file