From 98b9672ccf0295bc9a24353423b6855eb01f2041 Mon Sep 17 00:00:00 2001 From: Neuro Date: Thu, 2 May 2024 00:17:28 -0400 Subject: [PATCH 1/3] this has been a complete disaster but I'll keep this for future help with an rss reader that doesn't suck --- arr/docker-compose.yml | 5 ++++- mail/docker-compose.yml | 0 rss-reader/.env.example | 19 +++++++++++++++++ rss-reader/docker-compose.yml | 40 +++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) delete mode 100644 mail/docker-compose.yml create mode 100644 rss-reader/.env.example create mode 100644 rss-reader/docker-compose.yml diff --git a/arr/docker-compose.yml b/arr/docker-compose.yml index 049b242..4525540 100644 --- a/arr/docker-compose.yml +++ b/arr/docker-compose.yml @@ -9,11 +9,12 @@ services: - VIRTUAL_HOST=radarr.${DOMAIN},radar.${DOMAIN} - LETSENCRYPT_HOST=radarr.${DOMAIN},radar.${DOMAIN} - LETSENCRYPT_EMAIL=${EMAIL} - - LETSENCRYPT_TEST=true + #- LETSENCRYPT_TEST=true volumes: - ${CONFIG_LOCATION}/radarr:/config - ${DATA_LOCATION}/Movies:/movies - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "7878" ports: @@ -33,6 +34,7 @@ services: - ${CONFIG_LOCATION}/sonarr:/config - ${DATA_LOCATION}/TV:/tv - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "8989" ports: @@ -105,6 +107,7 @@ services: - ${CONFIG_LOCATION}/lidarr:/config - ${DATA_LOCATION}/Music:/music - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "8686" ports: diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml deleted file mode 100644 index e69de29..0000000 diff --git a/rss-reader/.env.example b/rss-reader/.env.example new file mode 100644 index 0000000..31eab5b --- /dev/null +++ b/rss-reader/.env.example @@ -0,0 +1,19 @@ +DOMAIN=example.com +UID=1000 +GID=1000 +TZ=Etc/UTC +DBUSER=freshrss +DBPASS=password +CONFIG_LOCATION=./config +DATA_LOCATION=./data +EMAIL=example@mail.com +# ADMIN_EMAIL=admin@example.net +# ADMIN_PASSWORD=freshrss +# ADMIN_API_PASSWORD=freshrss +# # Published port if running locally +# PUBLISHED_PORT=8080 +# # Database credentials (not relevant if using default SQLite database) +# DB_HOST=freshrss-db +# DB_BASE=freshrss +# DB_PASSWORD=freshrss +# DB_USER=freshrss \ No newline at end of file diff --git a/rss-reader/docker-compose.yml b/rss-reader/docker-compose.yml new file mode 100644 index 0000000..c4cea17 --- /dev/null +++ b/rss-reader/docker-compose.yml @@ -0,0 +1,40 @@ +services: + db: + image: mysql:8.0 + restart: always + environment: + MYSQL_DATABASE: freshrss + MYSQL_USER: ${DBUSER} + MYSQL_PASSWORD: ${DBPASS} + MYSQL_RANDOM_ROOT_PASSWORD: '1' + volumes: + - db:/var/lib/mysql + freshrss: + image: lscr.io/linuxserver/freshrss:latest + container_name: freshrss + environment: + - PUID=1000 + - PGID=1000 + - TZ=Etc/UTC + - MYSQL_DB_HOST=db + - MYSQL_ROOT_PASSWORD=rootpass + - MYSQL_DATABASE=freshrss + - MYSQL_USER=${DBUSER} + - MYSQL_PASSWORD=${DBPASS} + - VIRTUAL_HOST=rss.${DOMAIN} + # - LETSENCRYPT_HOST=rss.${DOMAIN} + # - LETSENCRYPT_EMAIL=${EMAIL} + # - LETSENCRYPT_TEST=true + ports: + - "8085:80" + expose: + - "8085" + volumes: + - ./config:/config + restart: unless-stopped +volumes: + db: +networks: + default: + name: nginx-proxy + external: true From 126257c4943fe1fae3d0a83b7bb45f3f876c1d7c Mon Sep 17 00:00:00 2001 From: Neuro Date: Thu, 2 May 2024 01:46:15 -0400 Subject: [PATCH 2/3] there's a lot of BS here --- nginx-proxy/nginx/vhost.d/default | 9 ++++++ rss-reader/docker-compose.yml | 52 ++++++++++++++++++------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/nginx-proxy/nginx/vhost.d/default b/nginx-proxy/nginx/vhost.d/default index 5e59aa4..bcc5f96 100644 --- a/nginx-proxy/nginx/vhost.d/default +++ b/nginx-proxy/nginx/vhost.d/default @@ -8,3 +8,12 @@ location ^~ /.well-known/acme-challenge/ { break; } ## End of configuration add by letsencrypt container +location /tt-rss/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_pass http://127.0.0.1:8280/tt-rss/; + break; +} \ No newline at end of file diff --git a/rss-reader/docker-compose.yml b/rss-reader/docker-compose.yml index c4cea17..27b769b 100644 --- a/rss-reader/docker-compose.yml +++ b/rss-reader/docker-compose.yml @@ -1,39 +1,49 @@ services: db: - image: mysql:8.0 - restart: always + image: postgres:15-alpine + restart: unless-stopped + env_file: + - .env environment: - MYSQL_DATABASE: freshrss - MYSQL_USER: ${DBUSER} - MYSQL_PASSWORD: ${DBPASS} - MYSQL_RANDOM_ROOT_PASSWORD: '1' + - POSTGRES_USER=${TTRSS_DB_USER} + - POSTGRES_PASSWORD=${TTRSS_DB_PASS} + - POSTGRES_DB=${TTRSS_DB_NAME} volumes: - - db:/var/lib/mysql - freshrss: - image: lscr.io/linuxserver/freshrss:latest - container_name: freshrss + - db:/var/lib/postgresql/data + app: + image: cthulhoo/ttrss-fpm-pgsql-static:latest + restart: unless-stopped + env_file: + - .env environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - - MYSQL_DB_HOST=db - - MYSQL_ROOT_PASSWORD=rootpass - - MYSQL_DATABASE=freshrss - - MYSQL_USER=${DBUSER} - - MYSQL_PASSWORD=${DBPASS} - VIRTUAL_HOST=rss.${DOMAIN} # - LETSENCRYPT_HOST=rss.${DOMAIN} # - LETSENCRYPT_EMAIL=${EMAIL} # - LETSENCRYPT_TEST=true ports: - - "8085:80" + - 8280:8280 expose: - - "8085" + - 8280 volumes: - - ./config:/config + - app:/var/www/html + - ./config.d:/opt/tt-rss/config.d:ro + depends_on: + - db + updater: + image: cthulhoo/ttrss-fpm-pgsql-static:latest restart: unless-stopped + env_file: + - .env + volumes: + - app:/var/www/html + - ./config.d:/opt/tt-rss/config.d:ro + depends_on: + - app + command: /opt/tt-rss/updater.sh volumes: db: + app: + backups: networks: default: name: nginx-proxy From 0ecb2f11338beb3867076c07237b437102dad10d Mon Sep 17 00:00:00 2001 From: Neuro Date: Sun, 5 May 2024 00:16:39 -0400 Subject: [PATCH 3/3] I don't remember --- arr/docker-compose.yml | 17 +++++++++++++++++ dashboard/data/homarr/db.sqlite | Bin 0 -> 73728 bytes nginx-proxy/client_max_body_size.conf | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 dashboard/data/homarr/db.sqlite diff --git a/arr/docker-compose.yml b/arr/docker-compose.yml index 4525540..3716390 100644 --- a/arr/docker-compose.yml +++ b/arr/docker-compose.yml @@ -1,4 +1,21 @@ services: + freshrss: + image: lscr.io/linuxserver/freshrss:latest + container_name: freshrss + environment: + - PUID=${UID} + - PGID=${GID} + - TZ=${TZ} + - VIRTUAL_HOST=rss.${DOMAIN} + - LETSENCRYPT_HOST=rss.${DOMAIN} + - LETSENCRYPT_EMAIL=${EMAIL} + volumes: + - ${CONFIG_LOCATION}/freshrss:/config + expose: + - "8085" + ports: + - 8085:80 + restart: unless-stopped radarr: image: lscr.io/linuxserver/radarr:latest container_name: radarr diff --git a/dashboard/data/homarr/db.sqlite b/dashboard/data/homarr/db.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..2986adbefc6206dd486e99d213e01549505cf1d0 GIT binary patch literal 73728 zcmeI*-*4N-0S9o=lBHOVqohNs8O8vvjS(9wZBY{SqeGE8wURpVoK&%jq(ea+$)n6# zB4v{DkGu>@usm!7iedl5o(5z<_ppCpj{}CG4@J?pJ?~q%0}217#_SPWTd% zMU!`@yU+b1b%y-lqixHlqUpFT;)}V+<%l3e-WSD4B(lVwZ?I>7OR}9<{}=Wu4DFw{ zyA)Zo|Gbd;SL8};Ba(`yo-h3H(wFo9xcJZHU*`Xm_&oWW_@jh5dnf*8?BB89u^`wW z0D=D}f%{kD>9?1J1Isq(amS;sY8mWt>`~9N9Q%zAs+Eo1inz72S$QbdhXT~adplx1 z3|1Fcdgr!``YOGgNaq%X?tCvv%RXcSlIRFOyu|xD-#<)`dvV#ye>8 z8Xz4%uu{izs>)-BQcsfeiS*U0!qcN32d{Ykyf|8DeyCs0uzW-L8_ss!CM_BS;U%Xn zVl`j*_2V8nHBO7o16nQ87>d^>o_FN9EDXow0X)+52ftaKN{p6epQa&hR&H(7ws%F7 zG(9?!BNo;AtsUG!x%Wm{S zh5N~I#eT2}HG8R9A;U%CA_+j-A zqU`y8+k1C?z2P{GCSB8=)_M@*#=(2b-e^)zn~ghRdX}x)^hjk@GhXGs+Zk;ghUM{b zKy9*QfkHx#S zYC3wy3rjgcE^pndR<>^M@F64|x7mnaUlpsBTa{{M=Yz_FV5G0}0frrC1AXoOCZ7gu zMD9*CaVVC=Ydc97;^~d0^PIvmsdBh8_hfc9 zkzQOBp3vO5eCVDp1@k@*VwAZV3oi*(jkA{~8Dq#~|I5P0Sy}0TifBcxIvw?4r z9=oP{;T`(T%=1qNSQc-nv8>el`LDA}i~jzgEUPT|XnluW?6oUeioL9Vgtev0;m&M# zRY;^2Md)^VRjsOqYdwCGQej}#IOM~M z&$d0{?TvK?d-C|tew;2oUDWtxL zum?5>KmY;|fB*y_009U<00Izz00h220(XVkNOxgYF-$#ED(ADBk|~%)xunRnkk6Jh zn#tr$MJZ%Tl*%Pdk&6n+(Q-LoCRs%`NKq;4vY8Wp^>u9N_k2-bNc|_m9@roN0SG_< z0uX=z1Rwwb2tWV=5ST)NXf!g%*Zv9Mwha>S(NfdIVY89iS21QBUj9n ziyBcTOY^Vq|LsTB8J?y>Z{bV)N{6j z4FV8=00bZa0SG_<0uX=z1Rwx`R})x?)`Uqus)+G`lYIUV&(rNlF$2Q2xp6|E4ch}dAj=s;I z4QEYvTI)9s-dpzg`oEC+imm^Ds|7@25P$##AOHafKmY;|fB*y_009Vm2LgQkf0BO$mJ=9 zK+zxo0SG_<0uX=z1Rwwb2tWV=5Qy;gf8770AwU2E5P$##AOHafKmY;|fB*!hTLAa} z(_OzP9Rwf%0SG_<0uX=z1Rwwb2ta@f;Qk-&00Izz00bZa0SG_<0uX=z1RyZ|0{s3z zmim