From 91ad51248696bb9abfc4b209a5f18d396dc9403d Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 22 Feb 2024 16:06:05 +0100 Subject: [PATCH] wait #6717 @1 --- .docker/config/httpd/httpd.conf | 4 ++-- .docker/dev/docker-compose.yml | 4 ++-- .docker/dev/update.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf index 4d277bab7..e0344cf16 100644 --- a/.docker/config/httpd/httpd.conf +++ b/.docker/config/httpd/httpd.conf @@ -211,8 +211,8 @@ LoadModule xsendfile_module /usr/lib/apache2/modules/mod_xsendfile.so # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. # -User www-data -Group www-data +User #1001 +Group #33 diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index fea626a9e..297031913 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -95,7 +95,7 @@ services: - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf' # External volume - 'sshfsusstorage:/application/usstorage:ro' - - 'docs:/application/protected/fluidbookpublication/docs:ro' + - 'docsdev:/application/protected/fluidbookpublication/docs:ro' ports: - '37127:80' environment: @@ -183,7 +183,7 @@ volumes: gid: 33 password: "Qu2E9uq48bBzsqGiZA" - docs: + docsdev: driver: ucphhpc/sshfs:latest driver_opts: sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs" diff --git a/.docker/dev/update.sh b/.docker/dev/update.sh index 40a552d74..eed5ba7d9 100644 --- a/.docker/dev/update.sh +++ b/.docker/dev/update.sh @@ -6,7 +6,7 @@ chown root:root /home/toolbox/dev/.docker/config/sudoers docker network create fluidbook-toolbox-dev docker compose down docker volume rm fluidbook-toolbox-dev_sshfsusstorage -docker volume rm fluidbook-toolbox-dev_docs +docker volume rm fluidbook-toolbox-dev_docsdev docker compose up -d docker exec -it fluidbook-toolbox-dev /application/scripts/update.sh /home/toolbox/dev/scripts/fixrights.sh -- 2.39.5