diff --git a/freshrss/.env.gpg b/freshrss/.env.gpg new file mode 100644 index 0000000..c4e13bc Binary files /dev/null and b/freshrss/.env.gpg differ diff --git a/freshrss/docker-compose.yml b/freshrss/docker-compose.yml new file mode 100644 index 0000000..0d81026 --- /dev/null +++ b/freshrss/docker-compose.yml @@ -0,0 +1,42 @@ +version: "2.4" + +volumes: + data: + extensions: + db: + +services: + + freshrss: + image: freshrss/freshrss-alpine + container_name: freshrss + hostname: freshrss + restart: unless-stopped + expose: + - 8080 + logging: + options: + max-size: 10m + volumes: + - data:/var/www/FreshRSS/data + - extensions:/var/www/FreshRSS/extensions + environment: + TZ: Europe/Berlin + CRON_MIN: '3,33' + depends_on: + db + + freshrss-db: + image: postgres:15-alpine + container_name: freshrss-db + hostname: freshrss-db + restart: unless-stopped + logging: + options: + max-size: 10m + volumes: + - db:/var/lib/postgresql/data + environment: + POSTGRES_DB: ${DB_BASE} + POSTGRES_USER: ${DB_USER} + POSTGRES_PASSWORD: ${DB_PASSWORD} diff --git a/miniflux/enabled b/freshrss/enabled similarity index 100% rename from miniflux/enabled rename to freshrss/enabled diff --git a/miniflux/.env.gpg b/miniflux/.env.gpg deleted file mode 100644 index 822246c..0000000 Binary files a/miniflux/.env.gpg and /dev/null differ diff --git a/miniflux/docker-compose.yml b/miniflux/docker-compose.yml deleted file mode 100644 index 5dd0799..0000000 --- a/miniflux/docker-compose.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: '3.4' -services: - miniflux: - image: miniflux/miniflux:latest - expose: - - "8080" - depends_on: - - db - environment: - DATABASE_URL: postgres://miniflux:${DB_PW}@db/miniflux?sslmode=disable - VIRTUAL_HOST: rss.dmeiburg.de - LETSENCRYPT_HOST: rss.dmeiburg.de - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL} - OAUTH2_PROVIDER: oidc - OAUTH2_CLIENT_ID: miniflux - OAUTH2_CLIENT_SECRET: ${SECRET} - OAUTH2_REDIRECT_URL: https://rss.dmeiburg.de/oauth2/oidc/callback - OAUTH2_OIDC_DISCOVERY_ENDPOINT: https://sso.dmeiburg.de/application/o/miniflux/ - OAUTH2_USER_CREATION: 1 - RUN_MIGRATIONS: 1 - CREATE_ADMIN: 1 - ADMIN_USERNAME: admin - ADMIN_PASSWORD: ${ADMIN_PW} - - db: - image: postgres:15-alpine - environment: - POSTGRES_USER: miniflux - POSTGRES_PASSWORD: ${DB_PW} - volumes: - - miniflux-db:/var/lib/postgresql/data - healthcheck: - test: ["CMD", "pg_isready", "-U", "miniflux"] - interval: 10s - start_period: 30s - -volumes: - miniflux-db: - -networks: - default: - name: nginx-proxy - external: true