Merge branch 'main' into restart-the-main-frame
This commit is contained in:
commit
ffdfeaa529
|
@ -0,0 +1,3 @@
|
||||||
|
http-root/
|
||||||
|
data/
|
||||||
|
.env
|
|
@ -1,25 +1,24 @@
|
||||||
version: "3.7"
|
version: "3.7"
|
||||||
services:
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
|
image: nginx:mainline-alpine
|
||||||
container_name: nginx
|
container_name: nginx
|
||||||
hostname: ${DOMAIN_NAME:?err}
|
hostname: ${DOMAIN_NAME:?err}
|
||||||
volumes:
|
volumes:
|
||||||
- './http-root:/var/lib/nginx/html/http-root:ro'
|
- './http-root:/var/lib/nginx/html/http-root:ro'
|
||||||
- './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
|
- './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
|
||||||
- './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
|
- './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
|
||||||
image: nginx
|
|
||||||
restart: ${RESTART:-unless-stopped}
|
restart: ${RESTART:-unless-stopped}
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: linuxserver/syncthing
|
image: syncthing/syncthing:latest
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
hostname: ${DOMAIN_NAME:?err}
|
hostname: ${DOMAIN_NAME:?err}
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
- TZ=Europe/London
|
|
||||||
volumes:
|
volumes:
|
||||||
- './data/syncthing:/config'
|
- './data/syncthing:/var/syncthing/config'
|
||||||
- './http-root/chaotic-aur:/repo'
|
- './http-root/chaotic-aur:/repo'
|
||||||
ports:
|
ports:
|
||||||
- '127.0.0.1:8384:8384'
|
- '127.0.0.1:8384:8384'
|
||||||
|
@ -29,7 +28,7 @@ services:
|
||||||
restart: ${RESTART:-unless-stopped}
|
restart: ${RESTART:-unless-stopped}
|
||||||
|
|
||||||
cloudflared:
|
cloudflared:
|
||||||
image: erisamoe/cloudflared
|
image: erisamoe/cloudflared:latest
|
||||||
container_name: cloudflared
|
container_name: cloudflared
|
||||||
command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
|
command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
version: "3.7"
|
version: "3.7"
|
||||||
services:
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
|
image: nginx:mainline-alpine
|
||||||
container_name: nginx
|
container_name: nginx
|
||||||
hostname: ${DOMAIN_NAME:?err}
|
hostname: ${DOMAIN_NAME:?err}
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -16,19 +17,17 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- '80:80'
|
- '80:80'
|
||||||
- '443:443'
|
- '443:443'
|
||||||
image: nginx
|
|
||||||
restart: ${RESTART:-unless-stopped}
|
restart: ${RESTART:-unless-stopped}
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: linuxserver/syncthing
|
image: syncthing/syncthing:latest
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
hostname: ${DOMAIN_NAME:?err}
|
hostname: ${DOMAIN_NAME:?err}
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
- TZ=Europe/London
|
|
||||||
volumes:
|
volumes:
|
||||||
- './data/syncthing:/config'
|
- './data/syncthing:/var/syncthing/config'
|
||||||
- './http-root/chaotic-aur:/repo'
|
- './http-root/chaotic-aur:/repo'
|
||||||
ports:
|
ports:
|
||||||
- '127.0.0.1:8384:8384'
|
- '127.0.0.1:8384:8384'
|
||||||
|
@ -38,11 +37,11 @@ services:
|
||||||
restart: ${RESTART:-unless-stopped}
|
restart: ${RESTART:-unless-stopped}
|
||||||
|
|
||||||
certbot:
|
certbot:
|
||||||
|
image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
|
||||||
container_name: certbot
|
container_name: certbot
|
||||||
volumes:
|
volumes:
|
||||||
- './data/acme-webroot:/srv/http/webroot'
|
- './data/acme-webroot:/srv/http/webroot'
|
||||||
- './data/letsencrypt/etc:/etc/letsencrypt'
|
- './data/letsencrypt/etc:/etc/letsencrypt'
|
||||||
- './data/letsencrypt/var:/var/lib/letsencrypt'
|
- './data/letsencrypt/var:/var/lib/letsencrypt'
|
||||||
image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
|
|
||||||
entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'"
|
entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'"
|
||||||
restart: ${RESTART:-unless-stopped}
|
restart: ${RESTART:-unless-stopped}
|
||||||
|
|
|
@ -22,6 +22,12 @@ events {
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
|
# By default, multi-threading is disabled, so we enable it.
|
||||||
|
aio threads;
|
||||||
|
|
||||||
|
# Even if it not really need, it always good practice to set it up.
|
||||||
|
charset utf-8;
|
||||||
|
|
||||||
# Includes mapping of file name extensions to MIME types of responses
|
# Includes mapping of file name extensions to MIME types of responses
|
||||||
# and defines the default type.
|
# and defines the default type.
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
|
|
Loading…
Reference in New Issue