[taler-grid5k] 05/189: fix shard naming

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit dec8a98b1fce74adb99fea152ea84103a51258f5
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Feb 19 16:51:55 2022 +0100

    fix shard naming
---
 experiment/scripts/database.sh |  1 -
 experiment/scripts/shard.sh    | 15 +++++++++++----
 sql/exchange-shard-0000.sql    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index c5b00bb..e8bbdb0 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -185,7 +185,6 @@ EOF
  
   echo "OVERRIDING EXCHANGE SQL INIT SCRIPT"
   cp ${G5K_HOME}/sql/exchange-0001.sql /usr/share/taler/sql/exchange/
-  chown -R taler-exchange-httpd:taler-exchange-httpd 
/usr/share/taler/sql/exchange/exchange-0001.sql
 
   sudo -u taler-exchange-httpd taler-exchange-dbinit -r || true
   sudo -u taler-exchange-httpd taler-exchange-dbinit -s || true
diff --git a/experiment/scripts/shard.sh b/experiment/scripts/shard.sh
index caa5eee..8c87bb0 100755
--- a/experiment/scripts/shard.sh
+++ b/experiment/scripts/shard.sh
@@ -118,10 +118,17 @@ EOF
   
   cp ${G5K_HOME}/sql/exchange-shard-0000.sql /tmp
   chmod o+r /tmp/exchange-shard-0000.sql
-  su postgres << EOF
-psql -tA -d ${DB_NAME} -f /tmp/exchange-shard-0000.sql
-psql -tAc -d ${DB_NAME} SELECT setup_shard_tables('$(hostname | cut -d "." -f 
1)');
-EOF
+
+  PGPASSWORD=${DB_PASSWORD} psql -tA \
+                                -U ${DB_USER} \
+                                -h localhost \
+                                -d ${DB_NAME} \
+                                -f /tmp/exchange-shard-0000.sql
+  PGPASSWORD=${DB_PASSWORD} psql -tA \
+                                -U ${DB_USER} \
+                                -h localhost \
+                                -d ${DB_NAME} \
+                                -c "SELECT setup_shard_tables('$(hostname | 
cut -d "." -f 1)');"
   
 }
 
diff --git a/sql/exchange-shard-0000.sql b/sql/exchange-shard-0000.sql
index 0f60418..efb64b3 100644
--- a/sql/exchange-shard-0000.sql
+++ b/sql/exchange-shard-0000.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE FUNCTION setup_shard_tables(suffix INTEGER)
+CREATE OR REPLACE FUNCTION setup_shard_tables(suffix VARCHAR)
   RETURNS VOID
   LANGUAGE plpgsql
 AS $$

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.