Browse Source

update docs + paths

Christian Winther 1 year ago
parent
commit
c8c2e1c2eb

+ 2 - 2
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"

+ 0 - 1
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

+ 3 - 2
docker/shared/root/docker/templates/docker/shared/proxy/conf.d/docker-pixelfed.conf → 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

+ 0 - 0
docker/shared/root/shared/proxy/conf.d/.gitignore