mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-22 19:01:32 +00:00
Adding nginx, fixing up docker-compose files, fixing docs.
This commit is contained in:
parent
3136df3334
commit
4023fe96fc
6 changed files with 51 additions and 22 deletions
48
ansible/templates/nginx.conf
vendored
48
ansible/templates/nginx.conf
vendored
|
@ -51,23 +51,41 @@ server {
|
|||
# Upload limit for pictrs
|
||||
client_max_body_size 20M;
|
||||
|
||||
# lemmy api
|
||||
location /api/v1 {
|
||||
proxy_pass http://0.0.0.0:8536/api/v1;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
||||
# Cuts off the trailing slash on URLs to make them valid
|
||||
rewrite ^(.+)/+$ $1 permanent;
|
||||
|
||||
# WebSocket support
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
# Rate limit
|
||||
limit_req zone=lemmy_ratelimit burst=30 nodelay;
|
||||
}
|
||||
|
||||
# Docs
|
||||
location /docs {
|
||||
proxy_pass http://0.0.0.0:8536/docs;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
}
|
||||
|
||||
# lemmy-isomorphic-ui
|
||||
location / {
|
||||
proxy_pass http://0.0.0.0:8536;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_pass http://0.0.0.0:1235;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
}
|
||||
|
||||
# Cuts off the trailing slash on URLs to make them valid
|
||||
rewrite ^(.+)/+$ $1 permanent;
|
||||
|
||||
# WebSocket support
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
# Rate limit
|
||||
limit_req zone=lemmy_ratelimit burst=30 nodelay;
|
||||
}
|
||||
|
||||
# Redirect pictshare images to pictrs
|
||||
location ~ /pictshare/(.*)$ {
|
||||
|
|
2
config/defaults.hjson
vendored
2
config/defaults.hjson
vendored
|
@ -33,8 +33,6 @@
|
|||
port: 8536
|
||||
# json web token for authorization between server and client
|
||||
jwt_secret: "changeme"
|
||||
# The location of the frontend
|
||||
front_end_dir: "../ui/dist"
|
||||
# address where pictrs is available
|
||||
pictrs_url: "http://pictrs:8080"
|
||||
# rate limits for various user actions, by user ip
|
||||
|
|
7
docker/dev/docker-compose.yml
vendored
7
docker/dev/docker-compose.yml
vendored
|
@ -16,11 +16,14 @@ services:
|
|||
- postgres
|
||||
- iframely
|
||||
lemmy-isomorphic-ui:
|
||||
image: lemmy-isomorphic-ui:latest
|
||||
image: dessalines/lemmy-isomorphic-ui:v0.0.5
|
||||
# image: lemmy-isomorphic-ui:latest
|
||||
ports:
|
||||
- "1235:1234"
|
||||
environment:
|
||||
- LEMMY_HOST=lemmy
|
||||
- LEMMY_INTERNAL_HOST=lemmy:8536
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8536
|
||||
- LEMMY_HTTPS=false
|
||||
depends_on:
|
||||
- lemmy
|
||||
|
||||
|
|
2
docker/lemmy.hjson
vendored
2
docker/lemmy.hjson
vendored
|
@ -30,8 +30,6 @@
|
|||
# host where postgres is running
|
||||
host: "postgres"
|
||||
}
|
||||
# The location of the frontend
|
||||
front_end_dir: "/app/dist"
|
||||
# # optional: email sending configuration
|
||||
# email: {
|
||||
# # hostname of the smtp server
|
||||
|
|
12
docker/prod/docker-compose.yml
vendored
12
docker/prod/docker-compose.yml
vendored
|
@ -25,6 +25,18 @@ services:
|
|||
- pictrs
|
||||
- iframely
|
||||
|
||||
lemmy-isomorphic-ui:
|
||||
image: dessalines/lemmy-isomorphic-ui:v0.0.5
|
||||
# image: lemmy-isomorphic-ui:latest
|
||||
ports:
|
||||
- "1235:1234"
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy:8536
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8536
|
||||
- LEMMY_HTTPS=false
|
||||
depends_on:
|
||||
- lemmy
|
||||
|
||||
pictrs:
|
||||
image: asonix/pictrs:v0.1.13-r0
|
||||
ports:
|
||||
|
|
|
@ -98,7 +98,7 @@ async fn main() -> Result<(), LemmyError> {
|
|||
.configure(|cfg| images::config(cfg, &rate_limiter))
|
||||
.configure(nodeinfo::config)
|
||||
.configure(webfinger::config)
|
||||
.service(actix_files::Files::new("/docs", "/documentation"))
|
||||
.service(actix_files::Files::new("/docs", "/app/documentation"))
|
||||
})
|
||||
.bind((settings.bind, settings.port))?
|
||||
.run()
|
||||
|
|
Loading…
Reference in a new issue