wait #6717 @1

diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf
index 4d277bab783c72d21e65e5a289c7d2d8eeec9682..e0344cf16588ed79fea6a78421af809f2be44674 100644 (file)
--- 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
 
 </IfModule>
 

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index fea626a9e6b30290bbb2ea70a01f011a516d37cd..29703191322c0a7b9fbd81c671ddabb5b47be9e8 100644 (file)
--- 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 40a552d74abf6c370b32887ec3c9c56a683aef7b..eed5ba7d9aba66eab5dc2c64320f14b8f7746826 100644 (file)
--- 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