diff --git a/blueprints/gotify/docker-compose.yml b/blueprints/gotify/docker-compose.yml index 8713fb52..c8026c50 100644 --- a/blueprints/gotify/docker-compose.yml +++ b/blueprints/gotify/docker-compose.yml @@ -6,6 +6,8 @@ services: restart: unless-stopped expose: - "80" + environment: + - GOTIFY_DEFAULTUSER_PASS=${GOTIFY_DEFAULTUSER_PASS} volumes: - gotify-data:/app/data diff --git a/blueprints/gotify/template.toml b/blueprints/gotify/template.toml index 42d4953b..2b8eaac2 100644 --- a/blueprints/gotify/template.toml +++ b/blueprints/gotify/template.toml @@ -1,5 +1,11 @@ +[variables] +admin_password = "${password:32}" + [config] [[config.domains]] serviceName = "gotify" port = 80 host = "${domain}" + +[config.env] +GOTIFY_DEFAULTUSER_PASS = "${admin_password}" diff --git a/blueprints/jellyseerr/docker-compose.yml b/blueprints/jellyseerr/docker-compose.yml index 4860c71a..586691f8 100644 --- a/blueprints/jellyseerr/docker-compose.yml +++ b/blueprints/jellyseerr/docker-compose.yml @@ -7,7 +7,7 @@ services: expose: - "5055" environment: - - LOG_LEVEL=debug + - LOG_LEVEL=info - TZ=Etc/UTC volumes: - jellyseerr-config:/app/config diff --git a/blueprints/miniflux/docker-compose.yml b/blueprints/miniflux/docker-compose.yml deleted file mode 100644 index 6ec4135d..00000000 --- a/blueprints/miniflux/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: "3.8" - -services: - miniflux: - image: miniflux/miniflux:latest - restart: unless-stopped - expose: - - "8080" - depends_on: - miniflux-db: - condition: service_healthy - environment: - - DATABASE_URL=postgres://miniflux:${MINIFLUX_DB_PASSWORD}@miniflux-db/miniflux?sslmode=disable - - RUN_MIGRATIONS=1 - - CREATE_ADMIN=1 - - ADMIN_USERNAME=${MINIFLUX_ADMIN_USERNAME} - - ADMIN_PASSWORD=${MINIFLUX_ADMIN_PASSWORD} - - miniflux-db: - image: postgres:17-alpine - restart: unless-stopped - environment: - - POSTGRES_USER=miniflux - - POSTGRES_PASSWORD=${MINIFLUX_DB_PASSWORD} - - POSTGRES_DB=miniflux - volumes: - - miniflux-db-data:/var/lib/postgresql/data - healthcheck: - test: ["CMD", "pg_isready", "-U", "miniflux"] - interval: 10s - timeout: 5s - retries: 5 - -volumes: - miniflux-db-data: diff --git a/blueprints/miniflux/miniflux.svg b/blueprints/miniflux/miniflux.svg deleted file mode 100644 index 5f4ec6f5..00000000 --- a/blueprints/miniflux/miniflux.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/blueprints/miniflux/template.toml b/blueprints/miniflux/template.toml deleted file mode 100644 index 48291e85..00000000 --- a/blueprints/miniflux/template.toml +++ /dev/null @@ -1,15 +0,0 @@ -[variables] -admin_username = "admin" -admin_password = "${password}" -db_password = "${password}" - -[config] -[[config.domains]] -serviceName = "miniflux" -port = 8080 -host = "${domain}" - -[config.env] -MINIFLUX_ADMIN_USERNAME = "${admin_username}" -MINIFLUX_ADMIN_PASSWORD = "${admin_password}" -MINIFLUX_DB_PASSWORD = "${db_password}" diff --git a/blueprints/paperless-ngx/docker-compose.yml b/blueprints/paperless-ngx/docker-compose.yml deleted file mode 100644 index fd010a82..00000000 --- a/blueprints/paperless-ngx/docker-compose.yml +++ /dev/null @@ -1,58 +0,0 @@ -version: "3.8" - -services: - paperless-ngx: - image: ghcr.io/paperless-ngx/paperless-ngx:latest - restart: unless-stopped - expose: - - "8000" - depends_on: - paperless-db: - condition: service_healthy - paperless-redis: - condition: service_started - environment: - - PAPERLESS_REDIS=redis://paperless-redis:6379 - - PAPERLESS_DBHOST=paperless-db - - PAPERLESS_DBNAME=paperless - - PAPERLESS_DBUSER=paperless - - PAPERLESS_DBPASS=${PAPERLESS_DB_PASSWORD} - - PAPERLESS_SECRET_KEY=${PAPERLESS_SECRET_KEY} - - PAPERLESS_URL=https://${PAPERLESS_DOMAIN} - - PAPERLESS_TIME_ZONE=${PAPERLESS_TIME_ZONE} - - PAPERLESS_ADMIN_USER=${PAPERLESS_ADMIN_USER} - - PAPERLESS_ADMIN_PASSWORD=${PAPERLESS_ADMIN_PASSWORD} - volumes: - - paperless-data:/usr/src/paperless/data - - paperless-media:/usr/src/paperless/media - - paperless-export:/usr/src/paperless/export - - paperless-consume:/usr/src/paperless/consume - - paperless-db: - image: postgres:17-alpine - restart: unless-stopped - environment: - - POSTGRES_DB=paperless - - POSTGRES_USER=paperless - - POSTGRES_PASSWORD=${PAPERLESS_DB_PASSWORD} - volumes: - - paperless-db-data:/var/lib/postgresql/data - healthcheck: - test: ["CMD", "pg_isready", "-U", "paperless"] - interval: 10s - timeout: 5s - retries: 5 - - paperless-redis: - image: redis:7-alpine - restart: unless-stopped - volumes: - - paperless-redis-data:/data - -volumes: - paperless-data: - paperless-media: - paperless-export: - paperless-consume: - paperless-db-data: - paperless-redis-data: diff --git a/blueprints/paperless-ngx/paperless-ngx.svg b/blueprints/paperless-ngx/paperless-ngx.svg deleted file mode 100644 index 2e571364..00000000 --- a/blueprints/paperless-ngx/paperless-ngx.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/blueprints/paperless-ngx/template.toml b/blueprints/paperless-ngx/template.toml deleted file mode 100644 index d02973ac..00000000 --- a/blueprints/paperless-ngx/template.toml +++ /dev/null @@ -1,21 +0,0 @@ -[variables] -main_domain = "${domain}" -admin_user = "admin" -admin_password = "${password}" -db_password = "${password}" -secret_key = "${base64:48}" -timezone = "Etc/UTC" - -[config] -[[config.domains]] -serviceName = "paperless-ngx" -port = 8000 -host = "${main_domain}" - -[config.env] -PAPERLESS_DOMAIN = "${main_domain}" -PAPERLESS_ADMIN_USER = "${admin_user}" -PAPERLESS_ADMIN_PASSWORD = "${admin_password}" -PAPERLESS_DB_PASSWORD = "${db_password}" -PAPERLESS_SECRET_KEY = "${secret_key}" -PAPERLESS_TIME_ZONE = "${timezone}" diff --git a/blueprints/wakapi/docker-compose.yml b/blueprints/wakapi/docker-compose.yml index f240ce5a..ce399231 100644 --- a/blueprints/wakapi/docker-compose.yml +++ b/blueprints/wakapi/docker-compose.yml @@ -7,7 +7,7 @@ services: expose: - "3000" environment: - - WAKAPI_PASSWORD_SALT=change-me + - WAKAPI_PASSWORD_SALT=${WAKAPI_PASSWORD_SALT} - WAKAPI_DB_TYPE=sqlite3 - WAKAPI_DB_NAME=/data/wakapi.db - WAKAPI_LISTEN_IPV4=0.0.0.0 diff --git a/blueprints/wakapi/template.toml b/blueprints/wakapi/template.toml index 9de0022a..939158b3 100644 --- a/blueprints/wakapi/template.toml +++ b/blueprints/wakapi/template.toml @@ -1,5 +1,11 @@ +[variables] +password_salt = "${password:64}" + [config] [[config.domains]] serviceName = "wakapi" port = 3000 host = "${domain}" + +[config.env] +WAKAPI_PASSWORD_SALT = "${password_salt}" diff --git a/meta.json b/meta.json index 8fb6356b..ab7d063d 100644 --- a/meta.json +++ b/meta.json @@ -4194,24 +4194,6 @@ "docker" ] }, - { - "id": "miniflux", - "name": "Miniflux", - "version": "latest", - "description": "Miniflux is a minimalist and opinionated feed reader built for self-hosted RSS and Atom subscriptions.", - "logo": "miniflux.svg", - "links": { - "github": "https://github.com/miniflux/v2", - "website": "https://miniflux.app/", - "docs": "https://miniflux.app/docs/docker.html" - }, - "tags": [ - "rss", - "feed-reader", - "news", - "self-hosted" - ] - }, { "id": "minio", "name": "Minio", @@ -4996,24 +4978,6 @@ "open-source" ] }, - { - "id": "paperless-ngx", - "name": "Paperless-ngx", - "version": "latest", - "description": "Paperless-ngx is a self-hosted document management system that indexes, archives, and organizes scanned documents.", - "logo": "paperless-ngx.svg", - "links": { - "github": "https://github.com/paperless-ngx/paperless-ngx", - "website": "https://paperless-ngx.com/", - "docs": "https://docs.paperless-ngx.com/setup/" - }, - "tags": [ - "documents", - "ocr", - "archive", - "productivity" - ] - }, { "id": "parseable", "name": "Parseable",