wip #7255 @1

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e7ce92f58ff423eab9cc2bd495487d3546c2a3d7..1f0d0adf982b748102579dcf3651dc8ab759aee5 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -128,23 +128,21 @@ services:
     networks:
       - fluidbook-toolbox
 
-  #    mariadb:
-  #        container_name: fluidbook-toolbox-mariadb
-  #        image: 'mariadb'
-  #        restart: unless-stopped
-  #        ports:
-  #          - 12330:3306
-  #        environment:
-  #          MARIADB_ROOT_PASSWORD: 9xHw8nyRuphyTvqC
-  #          MARIADB_DATABASE: fluidbook-toolbox
-  #          MARIADB_AUTO_UPGRADE: 1
-  #        volumes:
-  #          - "./database/plugin:/usr/lib/mysql/plugin/"
-  #          - "./database/data:/var/lib/mysql"
-  #          - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
-  #          - "/home/toolbox/www/.docker/config/mariadb:/etc/mysql/conf.d:z"
-  #        networks:
-  #          - fluidbook-toolbox
+  mariadb:
+    container_name: fluidbook-toolbox-mariadb
+    image: 'mariadb'
+    restart: unless-stopped
+    environment:
+      MARIADB_ROOT_PASSWORD: 9xHw8nyRuphyTvqC
+      MARIADB_DATABASE: fluidbook-toolbox
+      MARIADB_AUTO_UPGRADE: 1
+    volumes:
+      - "./database/plugin:/usr/lib/mysql/plugin/"
+      - "./database/data:/var/lib/mysql"
+      - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
+      - "/home/toolbox/www/.docker/config/mariadb:/etc/mysql/conf.d:z"
+    networks:
+      - fluidbook-toolbox
 
   redis:
     container_name: fluidbook-toolbox-redis

diff --git a/scripts/fixrights.sh b/scripts/fixrights.sh
index 05d54da6d51f902702d020159bfd12af8985a621..fd349ec177fb347e50319be5e123af1f22fb69e1 100644 (file)
--- a/scripts/fixrights.sh
+++ b/scripts/fixrights.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-chown -R toolbox:www-data /home/toolbox/www/
-chown -R toolbox:www-data /data/toolbox/protected/
-chown root:root /home/toolbox/www/.docker/config/sudoers
-chown root:root /home/toolbox/www/.docker/config/cron/host
+chown -R 1001:33 /home/toolbox/www/
+chown -R 1001:33 /data/toolbox/protected/
+chown 0:0 /home/toolbox/www/.docker/config/sudoers
+chown 0:0 /home/toolbox/www/.docker/config/cron/host
 chmod -R 755 /home/toolbox/www/scripts
 chmod -R 775 /home/toolbox/www/protected
 chmod -R 775 /data/toolbox/protected
@@ -11,20 +11,20 @@ chmod -R 775 /home/toolbox/www/public
 chmod -R 775 /home/toolbox/www/bin
 
 
-chown -R toolbox:www-data /home/toolbox/dev/
-chown root:root /home/toolbox/dev/.docker/config/sudoers
-chown root:root /home/toolbox/dev/.docker/config/cron/host
+chown -R 1001:33 /home/toolbox/dev/
+chown 0:0 /home/toolbox/dev/.docker/config/sudoers
+chown 0:0 /home/toolbox/dev/.docker/config/cron/host
 chmod -R 775 /home/toolbox/dev/scripts
 chmod -R 775 /home/toolbox/dev/protected
 chmod -R 775 /home/toolbox/dev/public
 chmod -R 775 /home/toolbox/dev/bin
 
-chown -R toolbox:www-data /home/toolbox/alpha/
-chown root:root /data/toolbox/alpha/.docker/config/sudoers
-chown root:root /data/toolbox/alpha/.docker/config/cron/host
+chown -R 1001:33 /home/toolbox/alpha/
+chown 0:0 /data/toolbox/alpha/.docker/config/sudoers
+chown 0:0 /data/toolbox/alpha/.docker/config/cron/host
 chmod -R 775 /data/toolbox/alpha/scripts
 chmod -R 775 /data/toolbox/alpha/protected
 chmod -R 775 /data/toolbox/alpha/public
 chmod -R 775 /data/toolbox/alpha/bin
 
-find /data/extranet/www/fluidbook/ -type d -prune -o -exec chown -R toolbox:www-data {} \;
+find /data/extranet/www/fluidbook/ -type d -prune -o -exec chown -R 1001:33 {} \;