From b3d36ca05938527686fc338a85164bb50f383ac5 Mon Sep 17 00:00:00 2001
From: Daniel Meiburg <key@dmeiburg.de>
Date: Sun, 19 Feb 2023 23:22:30 +0100
Subject: [PATCH] Add freshrss instead of miniflux

---
 freshrss/.env.gpg              | Bin 0 -> 698 bytes
 freshrss/docker-compose.yml    |  42 ++++++++++++++++++++++++++++++++
 {miniflux => freshrss}/enabled |   0
 miniflux/.env.gpg              | Bin 770 -> 0 bytes
 miniflux/docker-compose.yml    |  43 ---------------------------------
 5 files changed, 42 insertions(+), 43 deletions(-)
 create mode 100644 freshrss/.env.gpg
 create mode 100644 freshrss/docker-compose.yml
 rename {miniflux => freshrss}/enabled (100%)
 delete mode 100644 miniflux/.env.gpg
 delete mode 100644 miniflux/docker-compose.yml

diff --git a/freshrss/.env.gpg b/freshrss/.env.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..c4e13bcadb7cbeb4bb4a170fa6c8bdea2579ffed
GIT binary patch
literal 698
zcmV;r0!96VUIW7aH>CT($_^3%2SAJ%3#kf%iFQt?5OY0-M^SOcK`?D@h!K4NgN%^n
zr8_XcHY-BWfv|MTL!65GQjs*805zX1(`X<Un0yCBri59@ny&tqkC)FLhX9{;Ij=Z{
z0gMCRc2EMP(F&vi3;?Z&oICKm=M}!`wSsJXd{6x-3*#GipZg3Nb>0IbowH(-*)mic
z=xx;QUlw>mR0QWHvVoslwxEA+!>_DP+w0%*jU~Q+oAIs!5I?62gBXafcqjgqBU&pO
z1WWif^#gw;{TxuI)ZS)%n)snFl7w;O`*?`=qK3J{<$(l*;<JydytOXKj}!G_C^y$J
z$OZnoQy*>nhGvERKmZPQi}}*jdPiw`A>bhptyN2B8<cT=X*R-hz-_B16-Ks|GOCQU
z_!bV=N<~UK6Colj)uCJK*9Y%2OrMz`zTw+0t^g-S;wk>LjqmDN!1#@buR`7Ar&Ft5
zvVf7_V#;IvT66vl3osi&lYLgo%r9UsX^7ZHy4mPY3VOJhWZW;j^Tok=R_8Jq08dn)
zLPfNM4+k$Hi^eQNOksG)>A6MZc!aI<8`zd~<+j;po^O?u!E0*rS#!^P5X4b<TUEtU
z2IaMUtO(!gZ=dkUxu_`DX?}8KN;M!-yS3U4TefAT6;aZ_2m#Fzd5jX6NQBaVvho1A
z%>BB^#S7^UE3>fJF`VR$lU2q!#PJ$9N9U|3873s%+3of84~gvpM9X!M*3^%KWo4cG
z8tb7NEA^1r2j&vbz^@Lf7~I@QWn0w#Vx+>#)6&+qEcKH2tb-c+qUJrc;!kQ-z&<#X
z>uuj@9K6uYF2Qa!A|os_C%H$Kv2R0ZJXH{K<qC+KbB)ra!ACR-+{)C8uB^|zieuq4
g<(YB>eOU1CLo(7j3(ual`b^rvJ+dVJ4iaf*d3;4(3;+NC

literal 0
HcmV?d00001

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 822246c5bd4c08f17ad23ce628b071cbd284cf02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 770
zcmV+d1O5DjUIW7aH>CT($_^3%2SA!L9;6J)33G5l_gKDUs!E%a-Im6l(YEN!<BJ!t
z_hv9UaC-+&F3uO9gUGa*Yh4Q>##md{{rlC2vXV5b8XmR4O%sD)(Nik91smyb2vfs_
z0gMCRc2EMP(F&vi3;$GjrUx6$i+tjlGsJUpG+1l*uDbCn?EzWxwL*16_YvUzrTk44
z4#WnIXZ$<PXsRvj6j?QdR<5jtTWyWJ=RS34;V;So*3h2Mxyz8j$!tad)_9WbghoAF
zrjBMd)EG?G4|#K$-eaWlUgh*>dbNRqnrUqYSy$c6*T(F*%j2Eq20rVkd_Fc>zjoTb
z%Ll9?6hh@fPD2hIdvq_D=kSTlAGghLM=tVVrFug5E7c;}owuzBtmjMQnGMCZSf4Ga
z8_ltQFS;6sYWDDAv=mY=(QFkke>r~<FySz8g&l34*=|(~iP2|M7IhKsxKM_|&$w!K
zBHTQ(#HECZUd#}@F@?$U1>b#%C?j}giXHTTYs<9!bsIN5I<OM}iY_OK6WpSSrQ7cA
z^h+&4gHFrOhmeq$tqcI$M#Wgfxp`<Zsr0<MvRvl1IA93)yFb1<%={*?bXPYPtVE}h
z43x1LB)lR~zn`&vlfpW^@*5aeI1BM@hR~wO&JwvdZ`#tpPys|pV<MU4fQ;i)t8|_H
z@}whS4a8LXQ}=IvK&Q<hPkwaw-(DLnY+=_La~H^p=%XqDv3=NVQzRr{F*|BDgq7dG
zad*1oIiLhy$X@w~-F_IwSxV}VI}6cUp1^AT5gcyleuKlNZFojj0c{>B=0Si~)WD6i
zbRX%({_)*YE2yET`!MQ9QLdzQZlnE19V=*1?o~=r8sg?nom<+A_GvEOlyI`o9IeXM
zS!Ch%%3IE2{VKP-ZqSh}N45?xzJW`S)4b=j&bvz}K2C<c8O0s2zQh*-_C`*%JWh7n
zh;k+4RD^TUs&8Sfk)f^AHv>eWv{uqo=dF`^(v{>U2?wqi0~lpwwvDLj{H`YipJ1bd
Aod5s;

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