From 4d00af8d54cf41f88c8be7c1930d4f14503e7e47 Mon Sep 17 00:00:00 2001
From: Rudi Klein <rudi.klein@rudiklein.nl>
Date: Fri, 12 Jul 2024 21:39:07 +0200
Subject: [PATCH] Merge 2 doc folders

---
 .github/workflows/docker-image.yml              |  4 ++--
 KleinServer.tree => KleinDocs.tree              |  8 +++++---
 redirection-rules.xml                           |  8 ++++++++
 topics/{ => KleinOps}/Endpoints.md              |  2 +-
 topics/{Overview.md => KleinOps/KleinServer.md} | 10 ++++------
 topics/{ => KleinOps}/Routers.md                |  2 +-
 writerside.cfg                                  |  2 +-
 7 files changed, 22 insertions(+), 14 deletions(-)
 rename KleinServer.tree => KleinDocs.tree (54%)
 rename topics/{ => KleinOps}/Endpoints.md (98%)
 rename topics/{Overview.md => KleinOps/KleinServer.md} (92%)
 rename topics/{ => KleinOps}/Routers.md (97%)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b9c4423..c452540 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -30,10 +30,10 @@ jobs:
 
     steps:
       - name: Docker stop
-        run: docker stop KleinServerDocs  || true
+        run: docker stop KleinDocs  || true
       - name: Docker login
         run: docker login docker.dariusklein.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }}
       - name: Docker pull
         run: docker pull docker.dariusklein.nl/klein-server-docs
       - name: Docker run
-        run: docker run --rm -dit -p 9092:80 --name KleinServerDocs docker.dariusklein.nl/klein-server-docs
+        run: docker run --rm -dit -p 9092:80 --name KleinDocs docker.dariusklein.nl/klein-server-docs
diff --git a/KleinServer.tree b/KleinDocs.tree
similarity index 54%
rename from KleinServer.tree
rename to KleinDocs.tree
index d4b4e72..43c09d8 100644
--- a/KleinServer.tree
+++ b/KleinDocs.tree
@@ -2,10 +2,12 @@
 <!DOCTYPE instance-profile
         SYSTEM "https://resources.jetbrains.com/writerside/1.0/product-profile.dtd">
 
-<instance-profile id="KleinServer"
+<instance-profile id="KleinDocs"
                  name="KleinServer"
-                 start-page="Overview.md">
+                 start-page="KleinServer.md">
 
-    <toc-element topic="Overview.md"/>
+    <toc-element topic="Routers.md"/>
+    <toc-element topic="Endpoints.md"/>
+    <toc-element topic="KleinServer.md"/>
     <toc-element topic="ToDo.md"/>
 </instance-profile>
\ No newline at end of file
diff --git a/redirection-rules.xml b/redirection-rules.xml
index 039a375..2bb5fb2 100644
--- a/redirection-rules.xml
+++ b/redirection-rules.xml
@@ -18,4 +18,12 @@
         <description>Created after removal of "Tutorial" from Instance Name</description>
         <accepts>Tutorial.html</accepts>
     </rule>
+    <rule id="58a22738">
+        <description>Created after removal of "Reference" from KleinServer</description>
+        <accepts>Reference.html</accepts>
+    </rule>
+    <rule id="221060e">
+        <description>Created after removal of "Overview" from KleinServer</description>
+        <accepts>Overview.html</accepts>
+    </rule>
 </rules>
\ No newline at end of file
diff --git a/topics/Endpoints.md b/topics/KleinOps/Endpoints.md
similarity index 98%
rename from topics/Endpoints.md
rename to topics/KleinOps/Endpoints.md
index d29d652..e6f3ace 100644
--- a/topics/Endpoints.md
+++ b/topics/KleinOps/Endpoints.md
@@ -1,4 +1,4 @@
-# ENDPOINTS
+# Endpoints
 ## ___________________
 ### opnsense (KleinSense)
 ```
diff --git a/topics/Overview.md b/topics/KleinOps/KleinServer.md
similarity index 92%
rename from topics/Overview.md
rename to topics/KleinOps/KleinServer.md
index 965fd42..2a615c3 100644
--- a/topics/Overview.md
+++ b/topics/KleinOps/KleinServer.md
@@ -1,13 +1,13 @@
 # Kleinserver
 
 ## Users
-- Darius
+- **Darius**
 ```Persoonlijke services```
-- Rudi
+- **Rudi**
 ```Persoonlijke services```
-- Infra
+- **Infra**
 ```Services gerelateerd aan netwerk infrasctructuur```
-- Games + specific users for specific games
+- **Games** + specific users for specific games
 ```Game servers```
 
 ## Port ranges
@@ -36,13 +36,11 @@
 - Portfolio Database postress ```Port 5432```
 - DB-DB-1 ```Port 3306```
 - DB-DB-1 ```Port 3307```
-
 ### Docs
 - portfolio Docs ```Port 4002```
 - Kleincord docs ```Port 9090```
 - Wazuh notifier docs ```Port 9091```
 - Kleinserver docs ```Port 9092```
-
 ## Services
 - Wazuh
 - Jetbrain remote IDE (multiple)
diff --git a/topics/Routers.md b/topics/KleinOps/Routers.md
similarity index 97%
rename from topics/Routers.md
rename to topics/KleinOps/Routers.md
index 17ab0f7..c93fd95 100644
--- a/topics/Routers.md
+++ b/topics/KleinOps/Routers.md
@@ -1,4 +1,4 @@
-# ROUTERS
+# Routers
 ## ___________________________________
 
 ### KleinFritz
diff --git a/writerside.cfg b/writerside.cfg
index a71d8ea..9fc9521 100644
--- a/writerside.cfg
+++ b/writerside.cfg
@@ -7,5 +7,5 @@
     <images dir="images" web-path="images"/>
     <categories src="c.list"/>
     <vars src="v.list"/>
-    <instance src="KleinServer.tree"/>
+    <instance src="KleinDocs.tree"/>
 </ihp>
\ No newline at end of file