Paul Walko 2019-03-17 01:53:28 +00:00
parent 7c993f05e5
commit b9ef2d6a87
3 changed files with 13 additions and 12 deletions

View File

@ -12,8 +12,8 @@ services:
EMAIL: sysadmin@seaturtle.pw EMAIL: sysadmin@seaturtle.pw
# URL field must be working since nginx only starts if letsencrypt works # URL field must be working since nginx only starts if letsencrypt works
URL: seaturtle.pw URL: seaturtle.pw
SUBDOMAINS: seaturtle SUBDOMAINS: peugeot
EXTRA_DOMAINS: www.paul.walko.org,paul.walko.org EXTRA_DOMAINS: #www.paul.walko.org,paul.walko.org
VALIDATION: html # TODO Switch to dns + gandi api once pr is merged VALIDATION: html # TODO Switch to dns + gandi api once pr is merged
TZ: America/New_York TZ: America/New_York
volumes: volumes:
@ -25,11 +25,13 @@ services:
- ./ssl.conf:/config/nginx/ssl.conf:ro - ./ssl.conf:/config/nginx/ssl.conf:ro
- ./site-confs:/config/nginx/site-confs:ro - ./site-confs:/config/nginx/site-confs:ro
- ./jail.local:/config/jail2ban/jail.local:ro - ./jail.local:/config/jail2ban/jail.local:ro
# etc files
- /home/joe/docker/syncthing/sync:/sync:ro
ports: ports:
- 128.173.88.78:80:80 - 10.21.2.155:80:80
- 128.173.88.78:443:443 - 10.21.2.155:443:443
- 2607:b400:0006:cc80:0000:0aff:fe62:000b:80:80 - 2001:bc8:4728:8d0d::1:80:80
- 2607:b400:0006:cc80:0000:0aff:fe62:000b:443:443 - 2001:bc8:4728:8d0d::1:443:443
syncthing: syncthing:
restart: unless-stopped restart: unless-stopped
@ -45,6 +47,3 @@ services:
ports: ports:
- 22000:22000 - 22000:22000
- 21027:21027/udp - 21027:21027/udp
networks:
pew-net

View File

@ -6,8 +6,8 @@
# Redirect HTTP traffic to HTTPS # Redirect HTTP traffic to HTTPS
server { server {
listen 80; listen 80 default_server;
listen [::]:80 default_server: listen [::]:80 default_server;
server_name _; server_name _;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;

View File

@ -14,16 +14,18 @@ server {
} }
location /files { location /files {
alias /files;
autoindex on; autoindex on;
} }
location /sync { location /sync {
auth_basic "Restricted Content"; auth_basic "Restricted Content";
auth_basic_user_file /secrets/htpasswd; auth_basic_user_file /secrets/htpasswd;
alias /sync;
autoindex on; autoindex on;
} }
location /syncthing { location /syncthing/ {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;