diff --git a/docker-fogcutter/nginx/launch.sh b/docker-fogcutter/nginx/launch.sh index 1862bf4..6a8ffe1 100755 --- a/docker-fogcutter/nginx/launch.sh +++ b/docker-fogcutter/nginx/launch.sh @@ -10,7 +10,7 @@ docker run \ --env PGID=1000 \ --env EMAIL=sysadmin@seaturtle.pw \ --env URL=seaturtle.pw \ - --env SUBDOMAINS=airsonic,plex,syncthing,www \ + --env SUBDOMAINS=airsonic,plex,www \ --env VALIDATION=html \ --env TZ=US/Eastern \ --volume $PWD/config:/config:rw \ diff --git a/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled b/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled index 4126e05..c326db3 100644 --- a/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled +++ b/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled @@ -32,27 +32,27 @@ server { proxy_pass https://paulwalko.github.io; } - # Proxy misc files + # Proxy syncthing + location /syncthing/ { + auth_basic "not today buddy"; + auth_basic_user_file /config/nginx/syncthing-htpasswd; + proxy_set_header X-Real_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-proto $scheme; + proxy_pass http://syncthing:8384/; + } + + # Serve misc files location /files { alias /files-docker; autoindex on; } - # Server syncthing files + # Serve syncthing files location /sync { auth_basic "nope definitely not today buddy"; auth_basic_user_file /config/nginx/sync-htpasswd; alias /sync-docker; autoindex on; } - - # Weechat relay - location /weechat { - proxy_pass http://172.17.0.1:9001/weechat; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_read_timeout 604800; - proxy_set_header X-RealIP $remote_addr; - } } diff --git a/docker-fogcutter/nginx/site-confs/syncthing.seaturtle.pw.enabled b/docker-fogcutter/nginx/site-confs/syncthing.seaturtle.pw.enabled deleted file mode 100644 index af9bb42..0000000 --- a/docker-fogcutter/nginx/site-confs/syncthing.seaturtle.pw.enabled +++ /dev/null @@ -1,27 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name syncthing.seaturtle.pw; - - return 301 https://syncthing.seaturtle.pw$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - server_name syncthing.seaturtle.pw; - - # ssl conf - include /config/nginx/ssl.conf; - - # Proxy syncthing - location / { - auth_basic "not today buddy"; - auth_basic_user_file /config/nginx/syncthing-htpasswd; - - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://syncthing:8384; - } -} diff --git a/docker-fogcutter/syncthing/launch.sh b/docker-fogcutter/syncthing/launch.sh index 7c24bd3..7dad8ad 100755 --- a/docker-fogcutter/syncthing/launch.sh +++ b/docker-fogcutter/syncthing/launch.sh @@ -1,7 +1,7 @@ #!/bin/bash # Assumes pew-net exists -# Make config dir (as non-root) before launching +# Create mounted dirs (as non-root) before launching docker run \ --name syncthing \