From f75e60fc350b2441a29225a21775b5951d70e5dd Mon Sep 17 00:00:00 2001
From: ReachableCEO <charles@turnsys.com>
Date: Sun, 20 Jul 2025 12:54:19 -0500
Subject: [PATCH] jenkins works now. also i have a dashboard for the dev stack.

---
 EasyGate/docker-compose.yml |  9 ++++++++
 EasyGate/easy-gate.json     | 45 +++++++++++++++++++++++++++++++++++++
 Jenkins/docker-compose.yml  | 15 +++++--------
 3 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100755 EasyGate/docker-compose.yml
 create mode 100755 EasyGate/easy-gate.json

diff --git a/EasyGate/docker-compose.yml b/EasyGate/docker-compose.yml
new file mode 100755
index 0000000..38a02b9
--- /dev/null
+++ b/EasyGate/docker-compose.yml
@@ -0,0 +1,9 @@
+services:
+  easy-gate:
+    image: r7wx/easy-gate:latest
+    container_name: KNELDevStack-CDS-Dashboard
+    restart: always
+    ports:
+      - 11002:8080
+    volumes:
+      - ./easy-gate.json:/etc/easy-gate/easy-gate.json
diff --git a/EasyGate/easy-gate.json b/EasyGate/easy-gate.json
new file mode 100755
index 0000000..bf8b223
--- /dev/null
+++ b/EasyGate/easy-gate.json
@@ -0,0 +1,45 @@
+{
+    "addr": "0.0.0.0:8080",
+    "use_tls": false,
+    "cert_file": "",
+    "key_file": "",
+    "behind_proxy": false,
+    "title": "KNELDevOpsStack-Dashboard-CharlesDevServer",
+    "theme": {
+        "background": "#FFFFFF",
+        "foreground": "#000000"
+    },
+    "groups": [
+        {
+            "name": "internal",
+            "subnet": "192.168.1.1/24"
+        },
+        {
+            "name": "vpn",
+            "subnet": "10.8.1.1/24"
+        }
+    ],
+    "services": [
+        {
+            "name": "Jenkins",
+            "category": "",
+            "url": "http://192.168.3.6:11001",
+        }
+    ],
+    "notes": [
+        {
+            "name": "Simple note",
+            "text": "This is a simple note for vpn users",
+            "groups": [
+                "vpn"
+            ]
+        },
+        {
+            "name": "Another note",
+            "text": "Another note for internal users only",
+            "groups": [
+                "internal"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Jenkins/docker-compose.yml b/Jenkins/docker-compose.yml
index 79c0f6c..4b3216a 100644
--- a/Jenkins/docker-compose.yml
+++ b/Jenkins/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
   jenkins:
     image: jenkins/jenkins:lts
-    container_name: KNELDevStack-CDS-jenkins-server
+    container_name: jenkins-server
     restart: unless-stopped
     
     ports:
@@ -12,17 +12,14 @@ services:
     volumes:
       # Jenkins home directory for persistence
       - /home/localuser/KNELDevStack-CDS/docker-data/jenkins:/var/jenkins_home
-      # SSH private keys for connecting to remote systems
+      # SSH private keys for connecting to remote systems (read-only for security)
       - /home/localuser/KNELDevStack-CDS/docker-data/jenkins/ssh-private-keys:/var/jenkins_home/.ssh:ro
-      # Admin password secret
-      - /home/localuser/KNELDevStack-CDS/docker-data/jenkins/secrets:/var/jenkins_home/secrets:ro
+      # Admin password file (accessible at /run/secrets/jenkins-admin-pw inside container)
+      - /home/localuser/KNELDevStack-CDS/docker-data/jenkins/secrets:/run/secrets:ro
     
     environment:
-      # Set Java options for performance
-      - JAVA_OPTS=-Djenkins.install.runSetupWizard=false -Xmx1g -Xms512m
-      # Configure admin user from secret file
-      - JENKINS_ADMIN_ID=admin
-      - JENKINS_ADMIN_PASSWORD_FILE=/var/jenkins_home/secrets/jenkins-admin-pw
+      # Set Java options for performance (setup wizard enabled for initial admin setup)
+      - JAVA_OPTS=-Xmx1g -Xms512m
     
     # Resource limits for small instance
     deploy: