From 53aabb9d8fcc03c39ed20de44d160af9cd7de063 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 19 Mar 2025 07:24:32 -0400 Subject: [PATCH 1/3] Removing Docuseal; fixes for Graylog and LibreChat. --- docker-compose.yml | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9dac383f..5b828304 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1222,32 +1222,6 @@ services: - unmanic-cache:/backup/unmanic-cache:ro - wallos-db:/backup/wallos-db:ro - wallos-logos:/backup/wallos-logos:ro - docuseal: - container_name: docuseal - image: docuseal/docuseal:latest - labels: - homepage.group: Personal/Professional Services - homepage.name: Docuseal - homepage.href: https://docs.${MY_TLD} - homepage.description: OSS Document Signing & Verification - homepage.icon: docuseal.png - swag: enable - swag_proto: http - swag_port: 3000 - swag_url: sign.${MY_TLD} - swag.uptime-kuma.enabled: true - swag.uptime-kuma.monitor.url: https://sign.${MY_TLD} - networks: - default: null - ports: - - 3002:3000 - restart: unless-stopped - volumes: - - source: ${DOCKER_VOLUME_CONFIG}/docuseal - target: /data - type: bind - bind: - create_host_path: true duplicati: container_name: duplicati environment: @@ -1589,7 +1563,7 @@ services: create_host_path: true graylog: container_name: graylog - image: ${GRAYLOG_IMAGE:-graylog/graylog:6.1} + image: graylog/graylog:6.1 depends_on: graylog-datanode: condition: service_started @@ -1641,9 +1615,9 @@ services: - graylog-data:/usr/share/graylog/data/data graylog-datanode: container_name: graylog-datanode - image: ${DATANODE_IMAGE:-graylog/graylog-datanode:6.1} + image: graylog/graylog-datanode:6.1 environment: - GRAYLOG_DATANODE_NODE_ID_FILE: /var/lib/graylog-datanode/node-id + GRAYLOG_NODE_NAME: graylog-datanode GRAYLOG_DATANODE_PASSWORD_SECRET: ${GRAYLOG_PASSWORD_SECRET} GRAYLOG_DATANODE_MONGODB_URI: mongodb://graylog:${GRAYLOG_MONGODB_PASSWORD}@mongodb:27017/graylog?replicaSet=rinoa GRAYLOG_PATH_REPO: graylog @@ -2719,6 +2693,10 @@ services: - librechat-vectordb environment: DB_HOST: librechat-vectordb + OPENAI_API_KEY: ${LIBRECHAT_OPENAI_API_KEY} + DEEPSEEK_API_KEY: ${LIBRECHAT_DEEPSEEK_API_KEY} + MISTRAL_API_KEY: ${LIBRECHAT_MISTRAL_API_KEY} + ANTHROPIC_API_KEY: ${LIBRECHAT_ANTHROPIC_API_KEY} POSTGRES_DB: librechat POSTGRES_USER: librechat POSTGRES_PASSWORD: ${LIBRECHAT_PG_DB_PASSWD} @@ -5276,8 +5254,6 @@ volumes: name: paperless-ngx-media paperless-ngx-pg: name: paperless-ngx-pg - peppermint-pg-data: - name: peppermint-pg-data pgbackweb-data: name: pgbackweb-data plausible-db-data: From 8a218e7e42b69d365df8f7a78a807dfe88f0597f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 19 Mar 2025 08:54:33 -0400 Subject: [PATCH 2/3] Removing Docuseal; fixes for Graylog and LibreChat. --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b828304..af074346 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1198,11 +1198,9 @@ services: - netbird-letsencrypt:/backup/netbird-letsencrypt:ro - nextcloud_aio_mastercontainer:/backup/nextcloud_aio_mastercontainer:ro - ollama:/backup/ollama:ro - - open-webui:/backup/open-webui:ro - paperless-ngx-data:/backup/paperless-ngx-data:ro - paperless-ngx-media:/backup/paperless-ngx-media:ro - paperless-ngx-pg:/backup/paperless-ngx-pg:ro - - peppermint-pg-data:/backup/peppermint-pg-data:ro - pgbackweb-data:/backup/pgbackweb-data:ro - plausible-db-data:/backup/plausible-db-data:ro - plausible-event-data:/backup/plausible-event-data:ro @@ -5246,8 +5244,6 @@ volumes: name: nextcloud_aio_mastercontainer ollama: name: ollama - open-webui: - name: open-webui paperless-ngx-data: name: paperless-ngx-data paperless-ngx-media: From 2d84d26b277bf3954e9e93c47c8896e4bd0ca607 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 19 Mar 2025 10:58:17 -0400 Subject: [PATCH 3/3] Authelia fix. --- ansible/app-configs/authelia_configuration.yml.j2 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ansible/app-configs/authelia_configuration.yml.j2 b/ansible/app-configs/authelia_configuration.yml.j2 index 1c7126da..48764283 100644 --- a/ansible/app-configs/authelia_configuration.yml.j2 +++ b/ansible/app-configs/authelia_configuration.yml.j2 @@ -36,7 +36,8 @@ webauthn: timeout: 60s display_name: Authelia attestation_conveyance_preference: indirect - user_verification: preferred + selection_criteria: + user_verification: preferred ntp: address: "time.cloudflare.com:123" version: 4 @@ -143,11 +144,8 @@ identity_providers: oidc: hmac_secret: '{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['AUTHELIA_OIDC_HMAC_SECRET'] }}' jwks: - key_id: 'netbird' - key: | - {{ lookup("community.hashi_vault.vault_kv2_get", "env", engine_mount_point="rinoa-docker", url=vault_addr, token=vault_token_cleaned)["secret"]["AUTHELIA_OIDC_JWKS_KEY"] | replace("\\n", "\n") | indent(8) }} - certificate_chain: | - {{ lookup("community.hashi_vault.vault_kv2_get", "env", engine_mount_point="rinoa-docker", url=vault_addr, token=vault_token_cleaned)["secret"]["AUTHELIA_OIDC_JWKS_CERT_CHAIN"] | replace("\\n", "\n") | indent(8) }} + - key: | + {{ lookup("community.hashi_vault.vault_kv2_get", "env", engine_mount_point="rinoa-docker", url=vault_addr, token=vault_token_cleaned)["secret"]["AUTHELIA_OIDC_JWKS_KEY"] | replace("\\n", "\n") | indent(10) }} cors: allowed_origins_from_client_redirect_uris: true endpoints: