From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 18 Jan 2024 15:49:33 +0000 (+0000)
Subject: wait #6639 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2a14006474de4ccc6afaa7d7aac6df8214576915;p=cubeextranet.git

wait #6639 @0.5
---

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index c33cc3b5c..263c31d95 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -143,8 +143,8 @@ services:
       - 'fluidbook_docs:/application/fluidbook/docs'
       - 'fluidbook_hosting:/mnt/sshfs/fluidbook/data/fluidbook/hosting'
     tmpfs:
-      #- '/tmp:mode=777,uid=1002,gid=33'
-      - '/var/log/extranet:uid=1002,gid=33'
+      #- '/tmp:mode=777,uid=1001,gid=33'
+      - '/var/log/extranet:uid=1001,gid=33'
     ports:
       - '51695:8123'
       - '51895:22'
diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 487d936de..c92e209fa 100644
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -85,7 +85,7 @@ RUN pip3 install font-line
 
 RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
-RUN groupadd fluidbook;groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1002 extranet
+RUN groupadd fluidbook;groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 extranet
 
 # PHP-FPM packages need a nudge to make them docker-friendly
 COPY overrides.conf /etc/php/7.2/fpm/pool.d/z-overrides.conf
diff --git a/.docker/images/php/overrides.conf b/.docker/images/php/overrides.conf
index 044d0833f..171d8163d 100644
--- a/.docker/images/php/overrides.conf
+++ b/.docker/images/php/overrides.conf
@@ -26,7 +26,7 @@ catch_workers_output = yes
 ; Required to allow config-by-environment
 clear_env = no
 
-user = 1002
+user = 1001
 group = 33
 
 pm = dynamic
@@ -50,7 +50,7 @@ catch_workers_output = yes
 ; Required to allow config-by-environment
 clear_env = no
 
-user = 1002
+user = 1001
 group = 33
 
 pm = dynamic
diff --git a/.docker/images/php/startup b/.docker/images/php/startup
index 18f547b6d..24cd45a69 100644
--- a/.docker/images/php/startup
+++ b/.docker/images/php/startup
@@ -17,7 +17,7 @@ mkdir -p /stats
 if mountpoint -q "/stats"; then
     :
 else
-    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o uid=1002 -o gid=33 -o allow_other stats@dracula.cubedesigners.com:/docker/fluidbook-stats/www /stats
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o uid=1001 -o gid=33 -o allow_other stats@dracula.cubedesigners.com:/docker/fluidbook-stats/www /stats
 fi
 
 # Launch monit
diff --git a/bin/fixpackagerrights b/bin/fixpackagerrights
index 5280ca0b9..46fac64ca 100644
--- a/bin/fixpackagerrights
+++ b/bin/fixpackagerrights
@@ -3,6 +3,6 @@ chmod -R 777 /usr/local/web2exe
 mkdir -p /application/fluidbook/packager/download
 mkdir -p /application/fluidbook/packager/nwbuild
 chmod -R 777 /application/fluidbook/packager
-chown -R extranet:www-data /application/fluidbook/packager
+chown -R 1001:www-data /application/fluidbook/packager
 chmod -R 777 /tmp
-chown -R extranet:www-data /tmp
\ No newline at end of file
+chown -R 1001:www-data /tmp
\ No newline at end of file
diff --git a/bin/fixrights b/bin/fixrights
index 2750f8b21..e8c5ec24e 100644
--- a/bin/fixrights
+++ b/bin/fixrights
@@ -3,7 +3,7 @@ chown root:root /home/extranet/.docker/config/cron/host
 chown root:root /home/extranet/.docker/config/sudoers
 chown -R root:root /home/extranet/.docker/config/ssh
 chown -R root:root /home/extranet/.docker/config/rsyslog
-chown -R extranet:www-data /home/extranet/.docker/config/ssh/user
+chown -R 1001:www-data /home/extranet/.docker/config/ssh/user
 chmod -R 644 /home/extranet/.docker/config/ssh/server
 chmod 755 /home/extranet/.docker/config/ssh/server/*.d
 chmod 600 /home/extranet/.docker/config/ssh/server/*_key
@@ -13,8 +13,8 @@ chmod 600 /home/extranet/.docker/config/ssh/user/authorized_keys2
 chmod 600 /home/extranet/.docker/config/ssh/root/id_rsa
 chmod 700 /home/extranet/.docker/config/ssh/root/
 chmod 600 /home/extranet/.docker/config/ssh/root/authorized_keys2
-chown -R extranet:www-data /home/extranet/www
-chown -R extranet:www-data /data/extranet
+chown -R 1001:www-data /home/extranet/www
+chown -R 1001:www-data /data/extranet
 chmod -R 775 /home/extranet/www
 chmod 750 /home/extranet
 chmod 750 /home/extranet/www