Removing old UI, using new perseus UI.
parent
c687186771
commit
be6aa179f9
@ -1,11 +1,45 @@
|
|||||||
version: '3.7'
|
version: '3.7'
|
||||||
|
|
||||||
|
networks:
|
||||||
|
# communication to web and clients
|
||||||
|
torrentsexternalproxy:
|
||||||
|
# communication between lemmy services
|
||||||
|
torrentsinternal:
|
||||||
|
driver: bridge
|
||||||
|
internal: true
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
proxy:
|
||||||
|
image: nginx:1-alpine
|
||||||
|
networks:
|
||||||
|
- torrentsinternal
|
||||||
|
- torrentsexternalproxy
|
||||||
|
ports:
|
||||||
|
# actual and only port facing any connection from outside
|
||||||
|
- "8904:8904"
|
||||||
|
volumes:
|
||||||
|
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- torrents-csv
|
||||||
|
- torrents-csv-ui-perseus
|
||||||
|
|
||||||
torrents-csv:
|
torrents-csv:
|
||||||
image: dessalines/torrents-csv-server:latest
|
image: dessalines/torrents-csv-server:latest
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
hostname: torrents-csv
|
||||||
- "8902:8902"
|
networks:
|
||||||
|
- torrentsinternal
|
||||||
environment:
|
environment:
|
||||||
TORRENTS_CSV_DB_FILE: /app/torrents.db
|
TORRENTS_CSV_DB_FILE: /app/torrents.db
|
||||||
TORRENTS_CSV_FRONT_END_DIR: /app/dist
|
TORRENTS_CSV_FRONT_END_DIR: /app/dist
|
||||||
|
|
||||||
|
torrents-csv-ui-perseus:
|
||||||
|
image: dessalines/torrents-csv-ui-perseus:latest
|
||||||
|
restart: always
|
||||||
|
networks:
|
||||||
|
- torrentsinternal
|
||||||
|
environment:
|
||||||
|
PERSEUS_HOST: "0.0.0.0"
|
||||||
|
TORRENTS_CSV_ENDPOINT: "http://torrents-csv:8902"
|
||||||
|
|
||||||
|
@ -0,0 +1,55 @@
|
|||||||
|
worker_processes 1;
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
http {
|
||||||
|
upstream torrents-csv {
|
||||||
|
server "torrents-csv:8902";
|
||||||
|
}
|
||||||
|
upstream torrents-csv-ui-perseus {
|
||||||
|
server "torrents-csv-ui-perseus:8080";
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
# this is the port inside docker, not the public one yet
|
||||||
|
listen 8904;
|
||||||
|
|
||||||
|
# change if needed, this is facing the public web
|
||||||
|
server_name localhost;
|
||||||
|
server_tokens off;
|
||||||
|
|
||||||
|
gzip on;
|
||||||
|
gzip_types text/css application/javascript image/svg+xml;
|
||||||
|
gzip_vary on;
|
||||||
|
|
||||||
|
add_header X-Frame-Options SAMEORIGIN;
|
||||||
|
add_header X-Content-Type-Options nosniff;
|
||||||
|
add_header X-XSS-Protection "1; mode=block";
|
||||||
|
|
||||||
|
# frontend general requests
|
||||||
|
location / {
|
||||||
|
set $proxpass "http://torrents-csv-ui-perseus";
|
||||||
|
proxy_pass $proxpass;
|
||||||
|
|
||||||
|
rewrite ^(.+)/+$ $1 permanent;
|
||||||
|
# Send actual client IP upstream
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
}
|
||||||
|
|
||||||
|
# backend
|
||||||
|
location ~ ^/(service) {
|
||||||
|
proxy_pass "http://torrents-csv";
|
||||||
|
# proxy common stuff
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
|
||||||
|
# Send actual client IP upstream
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 5961585fe1fc378c27549786e7e0a7b39f0a7b2d
|
|
@ -1,6 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
git submodule update --remote
|
git submodule update --remote
|
||||||
git add data
|
git add data
|
||||||
git add ui
|
|
||||||
git commit -m"Updating torrents-csv-data."
|
git commit -m"Updating torrents-csv-data."
|
||||||
git push
|
git push
|
||||||
|
Loading…
Reference in New Issue