Update

Homepage/config/services.yaml

@@ -84,21 +84,21 @@
         id: lime
         tab: Home
         icon: myspeed.png
-        href: http://192.168.2.6:5216
+        href: http://192.168.2.13:5216
         widget:
           type: myspeed
-          url: http://192.168.2.6:5216
+          url: http://192.168.2.13:5216
           password: "!Sucyetat123"  # only required if password is set
 
     - mealie:
         id: cobalt
         tab: Home
         icon: mealie.png
-        href: http://192.168.2.7:9200/
+        href: http://192.168.2.13:9200/
         widget:
           type: mealie
-          url: http://192.168.2.7:9200
+          url: http://192.168.2.13:9200
-          key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb25nX3Rva2VuIjp0cnVlLCJpZCI6ImVhNDAxMTIzLTg1ZGItNDZhMi04Y2M1LTEzYmVmNGM2ZjgxMCIsIm5hbWUiOiJIb21lcGFnZSIsImludGVncmF0aW9uX2lkIjoiZ2VuZXJpYyIsImV4cCI6MTk0MDE1NTE4NX0.NgpovwuA-FGjt6f6q5kInmmIUadjXRCEpoowfRnYhHE
+          key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb25nX3Rva2VuIjp0cnVlLCJpZCI6IjMxNWM4ZmNjLWI1Y2ItNDMyMy1hNDNmLTIyNjAwYjU2ZTJlOSIsIm5hbWUiOiJob21lcGFnZSIsImludGVncmF0aW9uX2lkIjoiZ2VuZXJpYyIsImV4cCI6MTk0MjI2NjU4NH0.iPE6newlQ3PVqdbgDCDdsAqZrwZ6glROWI1kvq5zb_I
           version: 2 # only required if version > 1, defaults to 1
 
     - Nextcloud:
@@ -114,16 +114,6 @@
           password: "!Sucyetat123"
 
     - MyGitea:
-        id: navy
-        tab: Home    
-        icon: gitea.png
-        href: https://mygitea.mikemcfetridge.com/
-        widget:
-          type: gitea
-          url: https://mygitea.mikemcfetridge.com/
-          key: 1ba8eac5698e4e1ea9461b814635e5220b707767
-
-    - Gitea:
         id: navy
         tab: Home    
         icon: gitea.png
@@ -131,8 +121,7 @@
         widget:
           type: gitea
           url: https://gitea.mikemcfetridge.com/
-          key: 10db6351209bc8cd900f6b03064e5a4f3f971eb3
+          key: 6cac00dd2f58fcc1bcdeae858f896b1995a19fd9
-
 
     - BookStack:
         id: slate
@@ -260,27 +249,15 @@
 
 ##################################### Network & System TAB Services ##############################################################
 - Network:
-    - Pi-hole:
-        id: slate
-        tab: Network
-        href: http://192.168.2.5/admin/login
-        icon: pi-hole.png
-        widget:
-          type: pihole
-          url: http://192.168.2.5
-          version: 6
-          key: "!Sucyetat123"
-          fields: ["queries", "blocked", "blocked_percent", "gravity"]
-
     - Nginx Proxy Manager:
         id: emerald
         tab: Network
-        href: http://192.168.2.12:81
+        href: http://192.168.2.14:81
         icon: nginx-proxy-manager.png
         description: Nginx Proxy Manager
         widget:
           type: npm
-          url: http://192.168.2.12:81
+          url: http://192.168.2.14:81
           username: mmcfetridg@aol.com
           password: "!Sucyetat123"
           fields: ["enabled", "disabled", "total"]
@@ -337,7 +314,7 @@
           type: customapi
           url: https://patch.mikemcfetridge.com/api/v1/gethomepage/stats
           headers:
-            Authorization: Basic cGF0Y2htb25fYWVfYzJlZGUxODcyNzI4NDU0MTM1ZWI5ZWE3ZThkYmY1MTY6MzdlMDdlNjM4YjFiMjUzYjIyYWFjMWQ3ODA0ZTdhODExZTM0ZTMzNGM0MDczMjI5YWQwN2EwYjIzODU2NDhhOQ==
+            Authorization: Basic cGF0Y2htb25fYWVfNTIxMmM5ZDg4M2E1NzA0NGIzZmJhZDdhMzQyYjVlODg6MTI0YzlhYzQ3ZTBlM2EzYWZiMTdjOTE5MWExYzU5M2YxOGJhNDdkYWQ0NjBjZmU2MDJmZDQ5MzE2ZDM0MTQ1Ng==
           mappings:
           - field: total_hosts
             label: Total Hosts
@@ -372,14 +349,14 @@
         id: cerulean
         tab: Bookmarks
         icon: semaphore.png
-        href: http://192.168.2.7:3020
+        href: http://192.168.2.13:3020
         description: CI/CD Automation
 
     - Wg-Easy:
         id: rose
         tab: Bookmarks
         icon: wireguard.png
-        href: http://192.168.2.7:10086
+        href: http://192.168.2.13:10086
         description: Wireguard VPN
 
     - YouTube:

NginxProxyManager/.env

@@ -0,0 +1,13 @@
+# ============================================================
+# SYSTEM SETTINGS
+# ============================================================
+TZ=America/New_York
+DATA_PATH=/opt/Docker-Deployments/NginxProxyManager/data
+
+# ============================================================
+# DATABASE CREDENTIALS
+# ============================================================
+MYSQL_ROOT_PASSWORD=rhDGjilZm6XEMJ
+MYSQL_DATABASE=npm
+MYSQL_USER=npm
+MYSQL_PASSWORD=rhDGjilZm6XEMJ

NginxProxyManager/docker-compose.yml

@@ -1,52 +1,54 @@
-#
+# Nginx Proxy Manager & MariaDB Stack
 services:
   db:
-    image: 'jc21/mariadb-aria:latest'
+    image: jc21/mariadb-aria:latest
     container_name: npm-db
     restart: unless-stopped
     environment:
-      - MYSQL_ROOT_PASSWORD=rhDGjilZm6XEMJ
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_DATABASE=npm
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=npm
+      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=rhDGjilZm6XEMJ
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MARIADB_AUTO_UPGRADE=1
+      - TZ=${TZ}
     volumes:
-      - /opt/Docker-Deployments/NginxProxyManager/data/mysql:/var/lib/mysql
+      - ${DATA_PATH}/mysql:/var/lib/mysql
     networks:
       - internal
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u$MYSQL_USER", "-p$MYSQL_PASSWORD"]
+      test: ["CMD-SHELL", "mariadb-admin ping -h 127.0.0.1 -u root -p$$MYSQL_ROOT_PASSWORD || exit 1"]
       interval: 20s
       timeout: 5s
       retries: 5
       start_period: 30s
 
   nginx-proxy-manager:
-    image: 'jc21/nginx-proxy-manager:latest'
+    image: jc21/nginx-proxy-manager:latest
     container_name: nginx-proxy-manager
     restart: unless-stopped
     environment:
-      - TZ=America/New_York
+      - TZ=${TZ}
       - DB_MYSQL_HOST=db
       - DB_MYSQL_PORT=3306
-      - DB_MYSQL_USER=npm
+      - DB_MYSQL_USER=${MYSQL_USER}
-      - DB_MYSQL_PASSWORD=rhDGjilZm6XEMJ
+      - DB_MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - DB_MYSQL_NAME=npm
+      - DB_MYSQL_NAME=${MYSQL_DATABASE}
     ports:
       - '80:80'
       - '81:81'
       - '443:443'
     volumes:
-      - /opt/Docker-Deployments/NginxProxyManager/data/npm:/data
+      - ${DATA_PATH}/npm:/data
-      - /opt/Docker-Deployments/NginxProxyManager/data/letsencrypt:/etc/letsencrypt
+      - ${DATA_PATH}/letsencrypt:/etc/letsencrypt
-      - /opt/Docker-Deployments/NginxProxyManager/logs:/data/logs
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+        restart: true
     networks:
       - internal
       - external
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:81/api/status"]
+      test: ["CMD", "curl", "-f", "http://localhost:81/"]
       interval: 20s
       timeout: 5s
       retries: 5

Patchmon/.env

@@ -18,7 +18,7 @@
 # Example: 
 #CORS_ORIGIN=https://patchmon.domain.tld,http://patchmon.local:3000
 
-CORS_ORIGIN=https://patch.mikemcfetridge.com,http://192.168.2.3:3000,http://localhost:3000
+CORS_ORIGIN=https://patch.mikemcfetridge.com,http://192.168.2.14:3000,http://localhost:3000
 JWT_SECRET=b552dcd09a958144ee3e436acd09767574fba73d2f4237496c97e6d2d59d2b6d4575d0148a3869276130d505492e73c023d40c090c42780fb611d0be9c29f4dc
 
 # ==============================================================================

Patchmon/docker-compose.yml

@@ -26,7 +26,8 @@ services:
     ports:
       - "3000:3000"
     networks:
-      - patchmon-internal
+      - internal
+      - external
     depends_on:
       database:
         condition: service_healthy
@@ -47,7 +48,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     networks:
-      - patchmon-internal
+      - internal
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 3s
@@ -67,7 +68,7 @@ services:
     volumes:
       - redis_data:/data
     networks:
-      - patchmon-internal
+      - internal
     healthcheck:
       test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 3s
@@ -92,7 +93,8 @@ services:
     mem_limit: 512m
     cpus: '1.0'
     networks:
-      - patchmon-internal
+      - internal
+      - external
     healthcheck:
       test: ["CMD-SHELL", "nc -z localhost 4822 || exit 1"]
       interval: 10s
@@ -110,5 +112,7 @@ volumes:
   redis_data:
 
 networks:
-  patchmon-internal:
+  internal:
-    driver: bridge
+    external: true    # Tells Compose not to create this network
+  external:
+    external: true    # Tells Compose not to create this network

Watchtower/.env

@@ -1,11 +1,13 @@
 TZ=America/New_York
+PUID=1000
+PGID=1000
 WATCHTOWER_CLEANUP=true
 WATCHTOWER_INCLUDE_RESTARTING=true
 WATCHTOWER_ROLLING_RESTARTING=true
-WATCHTOWER_SCHEDULE=0 0 4 * * *
+WATCHTOWER_SCHEDULE="0 0 4 * * *"
 WATCHTOWER_INCLUDE_STOPPED=true
 WATCHTOWER_NOTIFICATIONS=email
-WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-Deply  # Add Server Name or IP Address
+WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-02
 WATCHTOWER_NOTIFICATION_EMAIL_FROM=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_TO=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.mmcfetridge.net
@@ -13,5 +15,3 @@ WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=465
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=miker@mmcfetridge.net
 WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=!Sucyetat123
 WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
-PUID=1000
-PGID=1000

Watchtower/docker-compose.yml

@@ -1,28 +1,29 @@
 services:
   watchtower:
-    image: containrrr/watchtower
+    image: nickfedor/watchtower:latest
     container_name: watchtower
     restart: unless-stopped
-    env_file: .env
+    env_file:
+      - .env
     environment:
       - DOCKER_API_VERSION=1.44
-      - TZ=America/New_York
+      - TZ=${TZ}
-      - PUID:=1000 # Reference PUID from .env
+      - PUID=${PUID}
-      - PGID=1000 # Reference PGID from .env
+      - PGID=${PGID}
-      - WATCHTOWER_CLEANUP=true
+      - WATCHTOWER_CLEANUP=${WATCHTOWER_CLEANUP}
-      - WATCHTOWER_INCLUDE_RESTARTING=true
+      - WATCHTOWER_INCLUDE_RESTARTING=${WATCHTOWER_INCLUDE_RESTARTING}
-      - WATCHTOWER_ROLLING_RESTARTING=true
+      - WATCHTOWER_ROLLING_RESTARTING=${WATCHTOWER_ROLLING_RESTARTING}
-      - WATCHTOWER_SCHEDULE=0 0 4 * * *
+      - WATCHTOWER_SCHEDULE=${WATCHTOWER_SCHEDULE}
-      - WATCHTOWER_INCLUDE_STOPPED=true
+      - WATCHTOWER_INCLUDE_STOPPED=${WATCHTOWER_INCLUDE_STOPPED}
-      - WATCHTOWER_NOTIFICATIONS=email
+      - WATCHTOWER_NOTIFICATIONS=${WATCHTOWER_NOTIFICATIONS}
-      - WATCHTOWER_NOTIFICATIONS_HOSTNAME=Docker-Deployment  # Add Server Name or IP Address
+      - WATCHTOWER_NOTIFICATIONS_HOSTNAME=${WATCHTOWER_NOTIFICATIONS_HOSTNAME}
-      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=miker@mmcfetridge.net
+      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=${WATCHTOWER_NOTIFICATION_EMAIL_FROM}
-      - WATCHTOWER_NOTIFICATION_EMAIL_TO=miker@mmcfetridge.net
+      - WATCHTOWER_NOTIFICATION_EMAIL_TO=${WATCHTOWER_NOTIFICATION_EMAIL_TO}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.mmcfetridge.net
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=465
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=miker@mmcfetridge.net
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=!Sucyetat123
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}
-      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
+      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=${WATCHTOWER_NOTIFICATION_EMAIL_DELAY}
     security_opt:
       - no-new-privileges:true
     volumes:
@@ -31,6 +32,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - external
+
 networks:
   external:
-    external: true    # Tells Compose not to create this network.
+    external: true

searxng/docker-compose.yml

@@ -4,16 +4,16 @@ services:
     image: docker.io/searxng/searxng:latest
     restart: unless-stopped
     ports:
-      - "8080:8080"
+      - "8081:8080"
     volumes:
       - /opt/Docker-Deployments/searxng:/etc/searxng:rw
-      - /opt/Docker-Deployments/searxng_cache:/var/cache/searxng:rw
+      - /opt/Docker-Deployments/searxng/searxng_cache:/var/cache/searxng:rw
     environment:
       - SEARXNG_BASE_URL=https://search.mikemcfetridge.com
       - UWSGI_WORKERS=${SEARXNG_UWSGI_WORKERS:-4}
       - UWSGI_THREADS=${SEARXNG_UWSGI_THREADS:-4}
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8080" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:8081" ]
       interval: 10s
       retries: 3
       timeout: 10s