From 5adf3a9e025fef1ccf359af7c9af0d76cf808ccb Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 28 May 2025 22:05:25 -0600 Subject: [PATCH] few simple updates --- config.sh | 6 ++ configs/cloudflare/tunnel-config.yml | 14 ++-- configs/homepage/services.yaml | 2 +- .../services.yaml.backup_20250528_144546 | 78 ------------------- docker-compose.yml | 28 +++++-- 5 files changed, 37 insertions(+), 91 deletions(-) delete mode 100644 configs/homepage/services.yaml.backup_20250528_144546 diff --git a/config.sh b/config.sh index 56888d0..1906dd7 100755 --- a/config.sh +++ b/config.sh @@ -120,6 +120,11 @@ POSTGRES_USER=listmonk POSTGRES_PASSWORD=changeMe POSTGRES_DB=listmonk +# Listmonk Database Performance Settings +LISTMONK_DB_MAX_OPEN=25 +LISTMONK_DB_MAX_IDLE=25 +LISTMONK_DB_MAX_LIFETIME=300s + # Listmonk Admin Configuration LISTMONK_ADMIN_USER=admin LISTMONK_ADMIN_PASSWORD=changeMe @@ -136,6 +141,7 @@ NOCODB_JWT_SECRET=changeMe NOCODB_DB_NAME=nocodb NOCODB_DB_USER=noco NOCODB_DB_PASSWORD=changeMe +HOMEPAGE_VAR_BASE_URL=https://changeme.org EOL echo "New .env file created with default values." diff --git a/configs/cloudflare/tunnel-config.yml b/configs/cloudflare/tunnel-config.yml index 0b0e15d..3406466 100644 --- a/configs/cloudflare/tunnel-config.yml +++ b/configs/cloudflare/tunnel-config.yml @@ -6,25 +6,25 @@ tunnel: test # e.g. 1234567890abcdef credentials-file: /home/coder/.cloudflared/test.json # e.g. /home/coder/.cloudflared/[insert tunnel number].json ingress: - - hostname: dashboard.reed.com + - hostname: dashboard.savetheostriches.com service: http://localhost:3010 - - hostname: code.reed.com + - hostname: code.savetheostriches.com service: http://localhost:8888 - - hostname: listmonk.reed.com + - hostname: listmonk.savetheostriches.com service: http://localhost:9000 - - hostname: docs.reed.com + - hostname: docs.savetheostriches.com service: http://localhost:4000 - - hostname: reed.com + - hostname: savetheostriches.com service: http://localhost:4001 - - hostname: n8n.reed.com + - hostname: n8n.savetheostriches.com service: http://localhost:5678 - - hostname: db.reed.com + - hostname: db.savetheostriches.com service: http://localhost:8090 # Catch-all rule (required) diff --git a/configs/homepage/services.yaml b/configs/homepage/services.yaml index db1a4aa..c81b9de 100644 --- a/configs/homepage/services.yaml +++ b/configs/homepage/services.yaml @@ -66,7 +66,7 @@ icon: mdi-database-outline widget: type: docker - container: listmonk-db + container: listmonk_db server: my-docker - PostgreSQL (NocoDB): href: "#" diff --git a/configs/homepage/services.yaml.backup_20250528_144546 b/configs/homepage/services.yaml.backup_20250528_144546 deleted file mode 100644 index b3d9172..0000000 --- a/configs/homepage/services.yaml.backup_20250528_144546 +++ /dev/null @@ -1,78 +0,0 @@ ---- -# For public access, replace "http://localhost" with your subdomain URLs - -- Essential Tools: - - Code Server: - href: "http://localhost:8888" - # href: "https://code.changeme.org" # Uncomment for public access - description: VS Code in the browser - icon: mdi-code-braces - widget: - type: docker - container: code-server-changemaker - server: my-docker - - Listmonk: - href: "http://localhost:9000" - # href: "https://listmonk.changeme.org" # Uncomment for public access - description: Newsletter & mailing list manager - icon: mdi-email-newsletter - widget: - type: docker - container: listmonk_app - server: my-docker - - NocoDB: - href: "http://localhost:8090" - # href: "https://db.changeme.org" # Uncomment for public access - description: No-code database platform - icon: mdi-database - widget: - type: docker - container: changemakerlite-nocodb-1 - server: my-docker - -- Content & Documentation: - - MkDocs (Live): - href: "http://localhost:4000" - # href: "https://docs.changeme.org" # Uncomment for public access - description: Live documentation server with hot reload - icon: mdi-book-open-page-variant - widget: - type: docker - container: mkdocs-changemaker - server: my-docker - - Static Site: - href: "http://localhost:4001" - # href: "https://test.com" # Uncomment for public access - description: Built documentation hosting - icon: mdi-web - widget: - type: docker - container: mkdocs-site-server-changemaker - server: my-docker - -- Automation & Infrastructure: - - n8n: - href: "http://localhost:5678" - # href: "https://n8n.changeme.org" # Uncomment for public access - description: Workflow automation platform - icon: mdi-workflow - widget: - type: docker - container: n8n-changemaker - server: my-docker - - PostgreSQL (Listmonk): - href: "#" - description: Database for Listmonk - icon: mdi-database-outline - widget: - type: docker - container: listmonk-db - server: my-docker - - PostgreSQL (NocoDB): - href: "#" - description: Database for NocoDB - icon: mdi-database-outline - widget: - type: docker - container: changemakerlite-root_db-1 - server: my-docker diff --git a/docker-compose.yml b/docker-compose.yml index ab117e7..40cc83c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,8 @@ +x-db-credentials: &db-credentials + POSTGRES_USER: &db-user ${POSTGRES_USER} + POSTGRES_PASSWORD: &db-password ${POSTGRES_PASSWORD} + POSTGRES_DB: &db-name ${POSTGRES_DB} + services: code-server: build: @@ -29,21 +34,34 @@ services: hostname: ${LISTMONK_HOSTNAME} depends_on: - listmonk-db + command: [sh, -c, "./listmonk --install --idempotent --yes --config '' && ./listmonk --upgrade --yes --config '' && ./listmonk --config ''"] + environment: + LISTMONK_app__address: 0.0.0.0:9000 + LISTMONK_db__user: *db-user + LISTMONK_db__password: *db-password + LISTMONK_db__database: *db-name + LISTMONK_db__host: listmonk-db + LISTMONK_db__port: 5432 + LISTMONK_db__ssl_mode: disable + LISTMONK_db__max_open: 25 + LISTMONK_db__max_idle: 25 + LISTMONK_db__max_lifetime: 300s + TZ: Etc/UTC + LISTMONK_ADMIN_USER: ${LISTMONK_ADMIN_USER:-} + LISTMONK_ADMIN_PASSWORD: ${LISTMONK_ADMIN_PASSWORD:-} volumes: - ./assets/uploads:/listmonk/uploads:rw listmonk-db: image: postgres:17-alpine - container_name: listmonk-db + container_name: listmonk_db restart: unless-stopped ports: - - "${LISTMONK_DB_PORT:-5432}:5432" + - "127.0.0.1:${LISTMONK_DB_PORT:-5432}:5432" networks: - changemaker environment: - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB} + <<: *db-credentials healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] interval: 10s