feat: updated create-user.sh init-mysql.sh as per latest dataserver u…

…pdate changes
uniuuu · Oct 22, 2023 · 2d1d79e · 2d1d79e
1 parent b94c7fd
commit 2d1d79e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bin/init.sh b/bin/init.sh
@@ -3,7 +3,7 @@
 set -eux
 
 sudo docker compose exec zotprime-dataserver sh -cux 'cd /var/www/zotero/misc && ./init-mysql.sh'
-sudo docker compose exec zotprime-dataserver sh -cux 'cd /var/www/zotero/misc && ./db_update.sh'
+#sudo docker compose exec zotprime-dataserver sh -cux 'cd /var/www/zotero/misc && ./db_update.sh'
 sudo docker compose exec zotprime-dataserver sh -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero'
 sudo docker compose exec zotprime-dataserver sh -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero-fulltext'
 sudo docker compose exec zotprime-dataserver sh -cux 'aws --endpoint-url "http://localstack:4575" sns create-topic --name zotero'
diff --git a/docker/dataserver/create-user.sh b/docker/dataserver/create-user.sh
@@ -4,7 +4,7 @@ set -x
 
 MYSQL="mysql -h mysql -P 3306 -u root -pzotero"
 
-echo "INSERT INTO libraries VALUES ('${5}', 'user', '0', '1')" | $MYSQL zotero_master
+echo "INSERT INTO libraries VALUES ('${5}', 'user', '0000-00-00 00:00:00', '0', '1', '0')" | $MYSQL zotero_master
 echo "INSERT INTO users VALUES ('${1}', '${5}', '${2}')" | $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

diff --git a/docker/db/init-mysql.sh b/docker/db/init-mysql.sh
@@ -20,16 +20,16 @@ echo "CREATE DATABASE zotero_www" | $MYSQL
 # Load in master schema
 $MYSQL zotero_master < master.sql
 $MYSQL zotero_master < coredata.sql
-$MYSQL zotero_master < events.sql
+#$MYSQL zotero_master < events.sql
 
 # Set up shard info
 echo "INSERT INTO shardHosts VALUES (1, 'mysql', 3306, 'up');" | $MYSQL zotero_master
 echo "INSERT INTO shards VALUES (1, 1, 'zotero_shard_1', 'up', '1');" | $MYSQL zotero_master
 echo "INSERT INTO shards VALUES (2, 1, 'zotero_shard_2', 'up', '1');" | $MYSQL zotero_master
 
 # Create first group & user
-echo "INSERT INTO libraries VALUES (1, 'user', 0, 1)" | $MYSQL zotero_master
-echo "INSERT INTO libraries VALUES (2, 'group', 0, 2)" | $MYSQL zotero_master
+echo "INSERT INTO libraries VALUES ('1', 'user', '0000-00-00 00:00:00', '0', '1', '0')" | $MYSQL zotero_master
+echo "INSERT INTO libraries VALUES ('2', 'group', '0000-00-00 00:00:00', '0', '2', '0')" | $MYSQL zotero_master
 echo "INSERT INTO users VALUES (1, 1, 'admin')" | $MYSQL zotero_master
 echo "INSERT INTO \`groups\` VALUES (1, 2, 'Shared', 'shared', 'Private', 'members', 'all', 'members', '', '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1)" | $MYSQL zotero_master
 echo "INSERT INTO groupUsers VALUES (1, 1, 'owner', '0000-00-00 00:00:00', '0000-00-00 00:00:00')" | $MYSQL zotero_master