diff --git a/.gitignore b/.gitignore index 8545e1c..ba95879 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ docker-fogcutter/nginx/config docker-fogcutter/plex/config docker-fogcutter/syncthing/config docker-fogcutter/syncthing/sync +docker-madone/nginx/config +docker-madone/syncthing/config +docker-madone/syncthing/sync diff --git a/docker-madone/nginx/launch.sh b/docker-madone/nginx/launch.sh index d1d739c..ad41271 100755 --- a/docker-madone/nginx/launch.sh +++ b/docker-madone/nginx/launch.sh @@ -15,6 +15,10 @@ docker run \ --volume $PWD/config:/config:rw \ --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \ --volume $PWD/site-confs:/config/nginx/site-confs:ro \ + --volume $PWD/../syncthing/sync:/sync-docker:ro \ + --volume $HOME/files:/files-docker:ro \ + --volume $PWD/syncthing-htpasswd:/config/nginx/syncthing-htpasswd:ro \ + --volume $PWD/sync-htpasswd:/config/nginx/sync-htpasswd:ro \ --publish 51.159.29.122:80:80 \ --publish 51.159.29.122:443:443 \ --publish [2001:bc8:6005:19:208:a2ff:fe0c:917c]:80:80 \ diff --git a/docker-madone/nginx/site-confs/madone.seaturtle.pw b/docker-madone/nginx/site-confs/madone.seaturtle.pw.enabled similarity index 93% rename from docker-madone/nginx/site-confs/madone.seaturtle.pw rename to docker-madone/nginx/site-confs/madone.seaturtle.pw.enabled index bf11e82..131bc56 100644 --- a/docker-madone/nginx/site-confs/madone.seaturtle.pw +++ b/docker-madone/nginx/site-confs/madone.seaturtle.pw.enabled @@ -3,7 +3,7 @@ server { listen [::]:80; server_name madone.seaturtle.pw; - return 301 https://seaturtle.pw$request_uri; + return 301 https://madone.seaturtle.pw$request_uri; } server { @@ -48,4 +48,6 @@ server { alias /sync-docker; autoindex on; } + + # Proxy everything else??? }