From 801fc8d1ceb411ae4421db693703b65f3b07818f Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Fri, 7 Mar 2025 20:43:35 -0600
Subject: [PATCH] sd

---
 Compose/librenms/.env        |  9 ++++----
 Compose/librenms/compose.yml | 44 +++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Compose/librenms/.env b/Compose/librenms/.env
index a65edf6..d6a2188 100644
--- a/Compose/librenms/.env
+++ b/Compose/librenms/.env
@@ -1,7 +1,8 @@
-TZ=Europe/Paris
-PUID=1000
-PGID=1000
+TZ=America/Chicago
+PUID=1001
+PGID=998
 
 MYSQL_DATABASE=librenms
 MYSQL_USER=librenms
-MYSQL_PASSWORD=libenms
\ No newline at end of file
+MYSQL_PASSWORD=libenms
+
diff --git a/Compose/librenms/compose.yml b/Compose/librenms/compose.yml
index 6a04fe3..05643ac 100644
--- a/Compose/librenms/compose.yml
+++ b/Compose/librenms/compose.yml
@@ -10,9 +10,11 @@ services:
       - "--lower-case-table-names=0"
       - "--character-set-server=utf8mb4"
       - "--collation-server=utf8mb4_unicode_ci"
+    networks:
+      - netgrimoire
     volumes:
       #- "./db:/var/lib/mysql"
-      - libre_db:/data/db
+      - libre_dbase:/data/db
     environment:
       - "TZ=${TZ}"
       - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
@@ -26,6 +28,8 @@ services:
     container_name: librenms_redis
     environment:
       - "TZ=${TZ}"
+    networks:
+      - netgrimoire
     restart: always
 
   libre_msmtpd:
@@ -33,6 +37,8 @@ services:
     container_name: librenms_msmtpd
     env_file:
       - "./msmtpd.env"
+    networks:
+      - netgrimoire
     restart: always
 
   librenms:
@@ -43,9 +49,7 @@ services:
       - NET_ADMIN
       - NET_RAW
     ports:
-      - target: 8000
-        published: 8000
-        protocol: tcp
+      - "8000:8000/tcp"
     depends_on:
       - libre_db
       - libre_redis
@@ -53,6 +57,8 @@ services:
     volumes:
      # - "./librenms:/data"
       - librenms:/data
+    networks:
+      - netgrimoire
     env_file:
       - "./librenms.env"
     environment:
@@ -79,13 +85,15 @@ services:
     volumes:
     #  - "./librenms:/data"
       - librenms:/data
+    networks:
+      - netgrimoire
     env_file:
       - "./librenms.env"
     environment:
       - "TZ=${TZ}"
       - "PUID=${PUID}"
       - "PGID=${PGID}"
-      - "DB_HOST=db"
+      - "DB_HOST=libre_db"
       - "DB_NAME=${MYSQL_DATABASE}"
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
@@ -105,15 +113,13 @@ services:
       - librenms
       - libre_redis
     ports:
-      - target: 514
-        published: 514
-        protocol: tcp
-      - target: 514
-        published: 514
-        protocol: udp
+      - "514:514/tcp"
+      - "514:514/udp"
     volumes:
     #  - "./librenms:/data"
       - librenms:/data
+    networks:
+      - netgrimoire
     env_file:
       - "./librenms.env"
     environment:
@@ -139,15 +145,13 @@ services:
       - librenms
       - libre_redis
     ports:
-      - target: 162
-        published: 162
-        protocol: tcp
-      - target: 162
-        published: 162
-        protocol: udp
+      - "162:162/tcp"
+      - "162:162/udp"
     volumes:
     #  - "./librenms:/data"
       - librenms:/data
+    networks:
+      - netgrimoire
     env_file:
       - "./librenms.env"
     environment:
@@ -163,7 +167,7 @@ services:
     restart: always
 
 
-  libre_db:
+  libre_dbase:
     driver: local
     driver_opts:
       type: none
@@ -176,4 +180,8 @@ services:
       type: none
       o: bind
       device: /DockerVol/librenms/data
+
+networks:
+  netgrimoire:
+    external: true   
   
\ No newline at end of file