From 48c162ffe10c221653cfb77ca02446eac9451eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Domr=C3=B6se?= Date: Sun, 8 Jun 2025 22:34:38 +0200 Subject: [PATCH] freshrss oauth --- README.md | 14 ++++- budibase/.env | 37 ------------ budibase/docker-compose.yml | 117 ------------------------------------ freshrss/.env | 6 ++ 4 files changed, 19 insertions(+), 155 deletions(-) delete mode 100644 budibase/.env delete mode 100644 budibase/docker-compose.yml create mode 100644 freshrss/.env diff --git a/README.md b/README.md index f22e5b6..5146d4c 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,16 @@ Docker Container * show only container name and status: ``` docker ps --format '{{.Names}}|{{.Status}}' | column -t -s "|" -``` \ No newline at end of file +``` + + +### SMTP Settings + +SMTP_USER=${SYSTEM_EMAIL_USER} +SMTP_PASSWORD=${SYSTEM_EMAIL_PASSSWORD} +SMTP_HOST=${SYSTEM_EMAIL_SMTP_HOST} +SMTP_PORT=${SYSTEM_EMAIL_SMTP_PORT} +SMTP_FROM_ADDRESS=${SYSTEM_EMAIL_USER} + +### OAUTH2 Integration +* use https://auth.domr.ovh \ No newline at end of file diff --git a/budibase/.env b/budibase/.env deleted file mode 100644 index 0ce3910..0000000 --- a/budibase/.env +++ /dev/null @@ -1,37 +0,0 @@ -# Use the main port in the builder for your self hosting URL, e.g. localhost:10000 -MAIN_PORT=10000 - -# This section contains all secrets pertaining to the system -# These should be updated -API_ENCRYPTION_KEY=testsecret -JWT_SECRET=testsecret -MINIO_ACCESS_KEY=budibase -MINIO_SECRET_KEY=budibase -COUCH_DB_PASSWORD=budibase -COUCH_DB_USER=budibase -REDIS_PASSWORD=budibase -INTERNAL_API_KEY=budibase - -# This section contains variables that do not need to be altered under normal circumstances -APP_PORT=4002 -WORKER_PORT=4003 -MINIO_PORT=4004 -COUCH_DB_PORT=4005 -COUCH_DB_SQS_PORT=4006 -REDIS_PORT=6379 -BUDIBASE_ENVIRONMENT=PRODUCTION -SQL_MAX_ROWS= - -# An admin user can be automatically created initially if these are set -BB_ADMIN_USER_EMAIL="soenke@domroese.eu" -BB_ADMIN_USER_PASSWORD="UnrealT!24" - -# A path that is watched for plugin bundles. Any bundles found are imported automatically/ -PLUGINS_DIR= -ROLLING_LOG_MAX_SIZE= - -SMTP_USER=${SYSTEM_EMAIL_USER} -SMTP_PASSWORD=${SYSTEM_EMAIL_PASSSWORD} -SMTP_HOST=${SYSTEM_EMAIL_SMTP_HOST} -SMTP_PORT=${SYSTEM_EMAIL_SMTP_PORT} -SMTP_FROM_ADDRESS=${SYSTEM_EMAIL_USER} diff --git a/budibase/docker-compose.yml b/budibase/docker-compose.yml deleted file mode 100644 index dd5577d..0000000 --- a/budibase/docker-compose.yml +++ /dev/null @@ -1,117 +0,0 @@ -# optional ports are specified throughout for more advanced use cases. -services: - app-service: - restart: unless-stopped - image: budibase/apps - container_name: bbapps - environment: - SELF_HOSTED: 1 - COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 - WORKER_URL: http://worker-service:4003 - MINIO_URL: http://minio-service:9000 - MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} - MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} - INTERNAL_API_KEY: ${INTERNAL_API_KEY} - BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT} - PORT: 4002 - API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} - JWT_SECRET: ${JWT_SECRET} - LOG_LEVEL: info - ENABLE_ANALYTICS: "true" - REDIS_URL: redis-service:6379 - REDIS_PASSWORD: ${REDIS_PASSWORD} - BB_ADMIN_USER_EMAIL: ${BB_ADMIN_USER_EMAIL} - BB_ADMIN_USER_PASSWORD: ${BB_ADMIN_USER_PASSWORD} - PLUGINS_DIR: ${PLUGINS_DIR} - OFFLINE_MODE: ${OFFLINE_MODE:-} - depends_on: - - worker-service - - redis-service - # volumes: - # - /some/path/to/plugins:/plugins - - worker-service: - restart: unless-stopped - image: budibase/worker - container_name: bbworker - environment: - SELF_HOSTED: 1 - PORT: 4003 - CLUSTER_PORT: ${MAIN_PORT} - API_ENCRYPTION_KEY: ${API_ENCRYPTION_KEY} - JWT_SECRET: ${JWT_SECRET} - MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} - MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} - MINIO_URL: http://minio-service:9000 - APPS_URL: http://app-service:4002 - COUCH_DB_USERNAME: ${COUCH_DB_USER} - COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD} - COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 - INTERNAL_API_KEY: ${INTERNAL_API_KEY} - REDIS_URL: redis-service:6379 - REDIS_PASSWORD: ${REDIS_PASSWORD} - OFFLINE_MODE: ${OFFLINE_MODE:-} - depends_on: - - redis-service - - minio-service - - minio-service: - restart: unless-stopped - image: minio/minio - volumes: - - minio_data:/data - environment: - MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} - MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} - MINIO_BROWSER: "off" - command: server /data --console-address ":9001" - healthcheck: - test: "timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1" - interval: 30s - timeout: 20s - retries: 3 - - proxy-service: - restart: unless-stopped - ports: - - "${MAIN_PORT}:10000" - container_name: bbproxy - image: budibase/proxy - environment: - - PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10 - - PROXY_RATE_LIMIT_API_PER_SECOND=20 - - APPS_UPSTREAM_URL=http://app-service:4002 - - WORKER_UPSTREAM_URL=http://worker-service:4003 - - MINIO_UPSTREAM_URL=http://minio-service:9000 - - COUCHDB_UPSTREAM_URL=http://couchdb-service:5984 - - RESOLVER=127.0.0.11 - depends_on: - - minio-service - - worker-service - - app-service - - couchdb-service - - couchdb-service: - restart: unless-stopped - image: budibase/couchdb:v3.3.3-sqs-v2.1.1 - environment: - - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD} - - COUCHDB_USER=${COUCH_DB_USER} - - TARGETBUILD=docker-compose - volumes: - - couchdb3_data:/opt/couchdb/data - - redis-service: - restart: unless-stopped - image: redis - command: redis-server --requirepass "${REDIS_PASSWORD}" - volumes: - - redis_data:/data - -volumes: - couchdb3_data: - driver: local - minio_data: - driver: local - redis_data: - driver: local diff --git a/freshrss/.env b/freshrss/.env new file mode 100644 index 0000000..e22aac0 --- /dev/null +++ b/freshrss/.env @@ -0,0 +1,6 @@ +OIDC_ENABLED=1 +OIDC_PROVIDER_METADATA_URL=https://auth.domr.ovh/application/o/freshrss/.well-known/openid-configuration +OIDC_CLIENT_ID=9O7GtmlyNAxaTwsO5Abg9BWCaCpHyzR551VC94qO +OIDC_CLIENT_SECRET=ZPTML006HvR0yoRonHIZdvSMIcHYjdkRcC8QT6DERZYmitTIV5cCZhEESQNaKW4vEI7i7z1tC4brbEMaC9ERsfxlOlm6ZTVVVc8kcfYIthUGLijhi2livaJzwSYjFaWZ +OIDC_X_FORWARDED_HEADERS=X-Forwarded-Port X-Forwarded-Proto X-Forwarded-Host +OIDC_SCOPES=openid email profile \ No newline at end of file