there's a lot of BS here

This commit is contained in:
Neuro 2024-05-02 01:46:15 -04:00
parent 98b9672ccf
commit 126257c494
2 changed files with 40 additions and 21 deletions

View File

@ -8,3 +8,12 @@ location ^~ /.well-known/acme-challenge/ {
break; break;
} }
## End of configuration add by letsencrypt container ## 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;
}

View File

@ -1,39 +1,49 @@
services: services:
db: db:
image: mysql:8.0 image: postgres:15-alpine
restart: always restart: unless-stopped
env_file:
- .env
environment: environment:
MYSQL_DATABASE: freshrss - POSTGRES_USER=${TTRSS_DB_USER}
MYSQL_USER: ${DBUSER} - POSTGRES_PASSWORD=${TTRSS_DB_PASS}
MYSQL_PASSWORD: ${DBPASS} - POSTGRES_DB=${TTRSS_DB_NAME}
MYSQL_RANDOM_ROOT_PASSWORD: '1'
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/postgresql/data
freshrss: app:
image: lscr.io/linuxserver/freshrss:latest image: cthulhoo/ttrss-fpm-pgsql-static:latest
container_name: freshrss restart: unless-stopped
env_file:
- .env
environment: 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} - VIRTUAL_HOST=rss.${DOMAIN}
# - LETSENCRYPT_HOST=rss.${DOMAIN} # - LETSENCRYPT_HOST=rss.${DOMAIN}
# - LETSENCRYPT_EMAIL=${EMAIL} # - LETSENCRYPT_EMAIL=${EMAIL}
# - LETSENCRYPT_TEST=true # - LETSENCRYPT_TEST=true
ports: ports:
- "8085:80" - 8280:8280
expose: expose:
- "8085" - 8280
volumes: 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 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: volumes:
db: db:
app:
backups:
networks: networks:
default: default:
name: nginx-proxy name: nginx-proxy