From c8c2e1c2eb03234cc9cbcb058f1b7cf9ce7984a1 Mon Sep 17 00:00:00 2001
From: Christian Winther <jippignu@gmail.com>
Date: Thu, 22 Feb 2024 15:24:51 +0000
Subject: [PATCH] update docs + paths

---
 docker-compose.yml                                           | 4 ++--
 docker/shared/root/docker/entrypoint.d/01-permissions.sh     | 1 -
 .../{docker => }/shared/proxy/conf.d/docker-pixelfed.conf    | 5 +++--
 docker/shared/root/shared/proxy/conf.d/.gitignore            | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename docker/shared/root/docker/templates/{docker => }/shared/proxy/conf.d/docker-pixelfed.conf (78%)
 create mode 100644 docker/shared/root/shared/proxy/conf.d/.gitignore

diff --git a/docker-compose.yml b/docker-compose.yml
index ca4ece22b..5df433c83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -98,7 +98,7 @@ services:
       VIRTUAL_PORT: "80"
     volumes:
       - "./.env:/var/www/.env"
-      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/docker/shared/proxy/conf.d"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/shared/proxy/conf.d"
       - "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
       - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
       - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
@@ -143,7 +143,7 @@ services:
       ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-}
     volumes:
       - "./.env:/var/www/.env"
-      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/docker/shared/proxy/conf.d"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/shared/proxy/conf.d"
       - "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
       - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
       - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
diff --git a/docker/shared/root/docker/entrypoint.d/01-permissions.sh b/docker/shared/root/docker/entrypoint.d/01-permissions.sh
index ad0dac724..930f69bca 100755
--- a/docker/shared/root/docker/entrypoint.d/01-permissions.sh
+++ b/docker/shared/root/docker/entrypoint.d/01-permissions.sh
@@ -11,7 +11,6 @@ entrypoint-set-script-name "$0"
 run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./.env"
 run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./bootstrap/cache"
 run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./storage"
-run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "/docker/shared/proxy/conf.d"
 run-as-current-user chown --verbose --recursive "${RUNTIME_UID}:${RUNTIME_GID}" "./storage/docker"
 
 # Optionally fix ownership of configured paths
diff --git a/docker/shared/root/docker/templates/docker/shared/proxy/conf.d/docker-pixelfed.conf b/docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
similarity index 78%
rename from docker/shared/root/docker/templates/docker/shared/proxy/conf.d/docker-pixelfed.conf
rename to docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
index 8bb8f1c95..0b221e604 100644
--- a/docker/shared/root/docker/templates/docker/shared/proxy/conf.d/docker-pixelfed.conf
+++ b/docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
@@ -4,8 +4,9 @@
 # This file is generated by the Pixelfed Docker setup, and
 # will be rewritten on every container start
 #
-# You can put any .conf file in this directory and it will be loaded
-# by nginx on startup.
+# You can put any [.conf] file in this directory
+# (docker-compose-state/config/proxy/conf.d) and it will
+# be loaded by nginx on startup.
 #
 # Run [docker compose exec proxy bash -c 'nginx -t && nginx -s reload']
 # to test your config and reload the proxy
diff --git a/docker/shared/root/shared/proxy/conf.d/.gitignore b/docker/shared/root/shared/proxy/conf.d/.gitignore
new file mode 100644
index 000000000..e69de29bb