Solving a caching issue of minio + small improvements when creating users

admin/create-user.sh

@@ -6,6 +6,6 @@ echo "INSERT INTO libraries VALUES (${1}, 'user', '0000-00-00 00:00:00', 0, 1)"
 echo "INSERT INTO users VALUES (${1}, ${1}, '${2}', '0000-00-00 00:00:00', '0000-00-00 00:00:00')" | $MYSQL zotero_master
 echo "INSERT INTO groupUsers VALUES (1, ${1}, 'member', '0000-00-00 00:00:00', '0000-00-00 00:00:00')" | $MYSQL zotero_master
 echo "INSERT INTO users VALUES (${1}, '${2}', MD5('${3}'))" | $MYSQL zotero_www
-echo "INSERT INTO users_email (userID, email) VALUES (1, '${4}')" | $MYSQL zotero_www
+echo "INSERT INTO users_email (userID, email) VALUES (${1}, '${4}')" | $MYSQL zotero_www
 echo "INSERT INTO shardLibraries VALUES (${1}, 'user', 0, 0)" | $MYSQL zotero_shard_1
 

docker/bin/create-user.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ -z "$1" -o -z "$2" -o -z "$3" ]; then
-	echo "Usage: ./create-user.sh {UID} {username} {password}"
+	echo "Usage: ./create-user.sh {UID} {username} {password} [email]"
 	exit 1
 fi
 
-sudo docker-compose exec app-zotero /var/www/zotero/admin/create-user.sh ${1} ${2} ${3}
+sudo docker-compose exec app-zotero /var/www/zotero/admin/create-user.sh ${1} ${2} ${3} ${4}

docker/docker-compose.yml

@@ -20,8 +20,9 @@ services:
       - SERVICES=sns,sqs,apigateway
   db-zotero-minio:
     image: minio/minio
-    build:
-      context: ./minio
+    ## ignore minio customizations
+    # build:
+    #   context: ./minio
     environment:
       - MINIO_ACCESS_KEY=zotero
       - MINIO_SECRET_KEY=zoterodocker

misc/init-mysql.sh

@@ -34,9 +34,11 @@ echo "INSERT INTO groupUsers VALUES (1, 1, 'owner', '0000-00-00 00:00:00', '0000
 $MYSQL zotero_www < www.sql
 
 echo "INSERT INTO users VALUES (1, 'admin', MD5('admin'))" | $MYSQL zotero_www
-echo "INSERT INTO users_email (userID, email) VALUES (1, 'admin@zotero.org')" | $MYSQL zotero_www
-echo "INSERT INTO storage_institutions (institutionID, domain, storageQuota) VALUES (1, 'zotero.org', 10000)" | $MYSQL zotero_www
-echo "INSERT INTO storage_institution_email (institutionID, email) VALUES (1, 'contact@zotero.org')" | $MYSQL zotero_www
+echo "INSERT INTO users_email (userID, email) VALUES (1, 'root@localhost')" | $MYSQL zotero_www
+# 10000 MB quota for users with email in institution "localhost"
+echo "INSERT INTO storage_institutions (institutionID, domain, storageQuota) VALUES (1, 'localhost', 10000)" | $MYSQL zotero_www
+# other emails in institution "localhost"
+echo "INSERT INTO storage_institution_email (institutionID, email) VALUES (1, 'root@localhost')" | $MYSQL zotero_www
 
 # Load in shard schema
 cat shard.sql | $MYSQL zotero_shard_1

model/Storage.inc.php

@@ -689,7 +689,7 @@ public static function getUploadPOSTData($item, Zotero_StorageFileInfo $info) {
 				. "Content-Disposition: form-data; name=\"$key\"\r\n\r\n"
 				. $val . "\r\n";
 		}
-		$prefix .= "--$boundary\r\nContent-Disposition: form-data; name=\"file\"\r\n\r\n";
+		$prefix .= "--$boundary\r\nContent-Disposition: form-data; name=\"file\"; filename=\"binary\"\r\n\r\n";
 
 		// Suffix
 		$suffix = "\r\n--$boundary--";