feat: change default minio config to support pre-signed urls

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

data/ldap/10_people_professor.ldif

@@ -3,7 +3,7 @@ objectClass: inetOrgPerson
 objectClass: organizationalPerson
 objectClass: person
 objectClass: top
-cn: Hubert J. Farnsworth
+cn: Hubert J. Farnsworth ([email protected])
 sn: Farnsworth
 description: Human
 displayName: Professor Farnsworth

docker-compose.yml

@@ -43,6 +43,7 @@ services:
           - stable32${DOMAIN_SUFFIX}
           - mail${DOMAIN_SUFFIX}
           - sso${DOMAIN_SUFFIX}
+          - minio${DOMAIN_SUFFIX}
           - imap${DOMAIN_SUFFIX}
           - collabora${DOMAIN_SUFFIX}
           - codedev${DOMAIN_SUFFIX}
@@ -679,6 +680,17 @@ services:
     volumes:
       - mysql:/var/lib/mysql
 
+  database-vitess:
+    image: vitess/base:v0.19.10
+    ports:
+      - "${IP_BIND:-127.0.0.1}:3306:3306"
+      - "${IP_BIND:-127.0.0.1}:9500:8000"
+    command: >
+      go run /vt/src/vitess.io/vitess/examples/demo/demo.go
+    extra_hosts:
+      - host.docker.internal:host-gateway
+# sh -c "ls /vt/src/vitess.io/vitess && cd /vt/src/vitess.io/vitess/examples/local && ./101_initial_cluster.sh"
+
   database-mariadb-primary:
     image: docker.io/bitnami/mariadb:10.6
     ports:
@@ -791,7 +803,9 @@ services:
       - "${IP_BIND:-127.0.0.1}:${PORTBASE:-800}8:80"
 
   saml:
-    image: unicon/simplesamlphp
+    build: 
+      context: ./docker/simplesamlphp
+      dockerfile: Dockerfile
     volumes:
       - ./docker/configs/var-simplesamlphp/config:/var/simplesamlphp/config
       - ./docker/configs/var-simplesamlphp/cert:/var/simplesamlphp/cert
@@ -826,8 +840,8 @@ services:
       USER3: "user2;user2"
       # -s "<name;/path>[;browse;readonly;guest;users;admins;writelist;comment]"
       SHARE: "public;/smbmount;yes;no;yes;all;admin;admin"
-      SHARE2: "user1;/smb/user1;yes;no;no;user1"
-      SHARE3: "user2;/smb/user2;yes;no;no;user2"
+      SHARE2: "user1;/smb/user1;yes;no;no;user1;user1"
+      SHARE3: "user2;/smb/user2;yes;no;no;user2;user1"
     volumes:
       - smb:/smbmount
       - smbhomes:/smb

docker/configs/storage.config.php

@@ -20,10 +20,12 @@
 				'bucket' => 'nc-' . $hostname,
 				'key' => 'nextcloud',
 				'secret' => 'nextcloud',
-				'hostname' => 'minio',
-				'port' => '9000',
+				'hostname' => 'minio.local',
+				'port' => '80',
+				'proxy' => 'minio:9000',
 				'use_ssl' => false,
 				'use_path_style' => true,
+				'use_presigned_url' => true,
 				'autocreate' => true,
 				'verify_bucket_exists' => true,
 			),
@@ -42,11 +44,13 @@
 				'bucket' => 'nc-' . $hostname,
 				'key' => 'nextcloud',
 				'secret' => 'nextcloud',
-				'hostname' => 'minio',
-				'port' => '9000',
+				'hostname' => 'minio.local',
+				'port' => '80',
+				'proxy' => 'minio:9000',
+				'use_presigned_url' => true,
 				'use_ssl' => false,
 				'use_path_style' => true,
 			),
 		),
 	];
-}
+}

scripts/php-mod-config

@@ -17,7 +17,9 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 restart() {
+    echo "restart" $SCRIPT_DIR $1
     (cd "$SCRIPT_DIR/.." && docker_compose exec "$1" pkill -USR1 apache2)
+    echo "restart" $SCRIPT_DIR $1 done
 }
 
 docker_exec() {
@@ -48,11 +50,14 @@ then
         echo "Setting $2 to $3"
         value="${3//\//\\\/}"
         docker_exec "$1" sed -i 's/^'"$2"'\s*=\s*.*/'"$2"'='"$value"'/g' /usr/local/etc/php/conf.d/xdebug.ini
+        echo "Setting $2 to $3 done"
     else
         echo "No value provided"
         exit 1
     fi
+    echo "restart"
     restart "$1"
+    echo "restart done"
     docker_exec "$1" cat /usr/local/etc/php/conf.d/xdebug.ini
     exit 0
 fi