diff --git a/.gitignore b/.gitignore index 7f16b07..a88cf20 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ docker-fogcutter/airsonic/config docker-fogcutter/minecraft/data docker-fogcutter/nginx/config docker-fogcutter/plex/config +docker-fogcutter/syncthing/config +docker-fogcutter/syncthing/sync diff --git a/docker-fogcutter/airsonic/launch.sh b/docker-fogcutter/airsonic/launch.sh index dd7df9d..d90be5f 100755 --- a/docker-fogcutter/airsonic/launch.sh +++ b/docker-fogcutter/airsonic/launch.sh @@ -11,5 +11,5 @@ docker run \ --volume /bigdata/media/music:/media/music:ro \ --volume /bigdata/media/playlists:/media/playlists \ --volume /bigdata/media/podcasts:/media/podcasts:ro \ - --publish 10.42.0.203:4040:4040 \ + --network pew-net \ linuxserver/airsonic:latest diff --git a/docker-fogcutter/nginx/launch.sh b/docker-fogcutter/nginx/launch.sh index 83b9a4f..d6146bc 100755 --- a/docker-fogcutter/nginx/launch.sh +++ b/docker-fogcutter/nginx/launch.sh @@ -8,7 +8,7 @@ docker run \ --env PGID=1000 \ --env EMAIL=sysadmin@seaturtle.pw \ --env URL=seaturtle.pw \ - --env SUBDOMAINS=birman,donskoy,fogcutter,madone,manx,sphynx,www \ + --env SUBDOMAINS=airsonic,manx,plex,syncthing,www \ --env VALIDATION=html \ --env TZ=US/Eastern \ --volume $PWD/config:/config:rw \ @@ -20,4 +20,5 @@ docker run \ --publish 10.42.0.203:443:443 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:80:80 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:443:443 \ + --network pew-net \ linuxserver/letsencrypt:latest diff --git a/docker-fogcutter/nginx/site-confs/donskoy.seaturtle.pw.enabled b/docker-fogcutter/nginx/site-confs/donskoy.seaturtle.pw.enabled deleted file mode 100644 index cb61952..0000000 --- a/docker-fogcutter/nginx/site-confs/donskoy.seaturtle.pw.enabled +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name donskoy.seaturtle.pw; - - return 301 https://donskoy.seaturtle.pw$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - server_name www.seaturtle.pw; - - # ssl conf - include /config/nginx/ssl.conf; - - return 301 https://seaturtle.pw$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - server_name donskoy.seaturtle.pw; - - # ssl conf - include /config/nginx/ssl.conf; - - client_max_body_size 1M; - - # Main site - location / { - proxy_pass http://bitwardenrs:80; - proxy_set_header Host $host; - 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; - } - - # Notifications - location /notifications/hub { - proxy_pass http://bitwardenrs:3012; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } - - # Notification negotiation? - location /notifications/hub/negotiate { - proxy_pass http://bitwardenrs:80; - } -} diff --git a/docker-fogcutter/plex/launch.sh b/docker-fogcutter/plex/launch.sh index ad3f2a1..bebfb19 100755 --- a/docker-fogcutter/plex/launch.sh +++ b/docker-fogcutter/plex/launch.sh @@ -1,5 +1,8 @@ #!/bin/bash +# plex.seaturtle.pw +# proxy port 32400 + docker run \ --name plex \ --detach \ @@ -11,5 +14,5 @@ docker run \ --volume /bigdata/media/movies:/media/movies:ro \ --volume /bigdata/media/music:/media/music:ro \ --volume /media-vtluug:/media/media-vtluug:ro \ - --net host \ + --network pew-net \ linuxserver/plex:latest diff --git a/docker-fogcutter/syncthing/launch.sh b/docker-fogcutter/syncthing/launch.sh new file mode 100755 index 0000000..fd30c36 --- /dev/null +++ b/docker-fogcutter/syncthing/launch.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# syncthing.seaturtle.pw +# proxy port 8384 + +docker run \ + --name syncthing \ + --detach \ + --restart unless-stopped \ + --env PUID=1000 \ + --env PGID=1000 \ + --env TZ=Europe/London \ + --env UMASK_SET=022 \ + --volume $PWD/config:/config:rw \ + --volume $PWD/sync:/sync-docker:rw \ + --publish 22000:22000 \ + --publish 21027:21027/udp \ + --network pew-net \ + linuxserver/syncthing:latest