diff --git a/arr/docker-compose.yml b/arr/docker-compose.yml index 049b242..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 @@ -9,11 +26,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 +51,7 @@ services: - ${CONFIG_LOCATION}/sonarr:/config - ${DATA_LOCATION}/TV:/tv - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "8989" ports: @@ -105,6 +124,7 @@ services: - ${CONFIG_LOCATION}/lidarr:/config - ${DATA_LOCATION}/Music:/music - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "8686" ports: diff --git a/dashboard/data/homarr/db.sqlite b/dashboard/data/homarr/db.sqlite new file mode 100644 index 0000000..2986adb Binary files /dev/null and b/dashboard/data/homarr/db.sqlite differ diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml deleted file mode 100644 index e69de29..0000000 diff --git a/nginx-proxy/client_max_body_size.conf b/nginx-proxy/client_max_body_size.conf index afbcd21..964fcea 100644 --- a/nginx-proxy/client_max_body_size.conf +++ b/nginx-proxy/client_max_body_size.conf @@ -1 +1 @@ -client_max_body_size 10000m; \ No newline at end of file +client_max_body_size 100000m; \ No newline at end of file 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/.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..27b769b --- /dev/null +++ b/rss-reader/docker-compose.yml @@ -0,0 +1,50 @@ +services: + db: + image: postgres:15-alpine + restart: unless-stopped + env_file: + - .env + environment: + - POSTGRES_USER=${TTRSS_DB_USER} + - POSTGRES_PASSWORD=${TTRSS_DB_PASS} + - POSTGRES_DB=${TTRSS_DB_NAME} + volumes: + - db:/var/lib/postgresql/data + app: + image: cthulhoo/ttrss-fpm-pgsql-static:latest + restart: unless-stopped + env_file: + - .env + environment: + - VIRTUAL_HOST=rss.${DOMAIN} + # - LETSENCRYPT_HOST=rss.${DOMAIN} + # - LETSENCRYPT_EMAIL=${EMAIL} + # - LETSENCRYPT_TEST=true + ports: + - 8280:8280 + expose: + - 8280 + volumes: + - 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 + external: true