4 files changed, 36 insertions, 23 deletions
diff --git a/script/dev-bucket.sh b/script/dev-bucket.sh
index 05d8c105..438d934d 100755
--- a/script/dev-bucket.sh
+++ b/script/dev-bucket.sh
@@ -9,11 +9,11 @@ GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
 NIX_RELEASE="${REPO_FOLDER}/result/bin/"
 PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
 
-garage bucket create eprouvette
-KEY_INFO=`garage key new --name opérateur`
+garage -c /tmp/config.1.toml bucket create eprouvette
+KEY_INFO=$(garage -c /tmp/config.1.toml key new --name opérateur)
 ACCESS_KEY=`echo $KEY_INFO|grep -Po 'GK[a-f0-9]+'`
 SECRET_KEY=`echo $KEY_INFO|grep -Po 'Secret key: [a-f0-9]+'|grep -Po '[a-f0-9]+$'`
-garage bucket allow eprouvette --read --write --key $ACCESS_KEY
+garage -c /tmp/config.1.toml bucket allow eprouvette --read --write --key $ACCESS_KEY
 echo "$ACCESS_KEY $SECRET_KEY" > /tmp/garage.s3
 
 echo "Bucket s3://eprouvette created. Credentials stored in /tmp/garage.s3."
diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh
index 0afdd97c..3ca3f74b 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -17,6 +17,10 @@ MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m"
 WHICH_GARAGE=$(which garage || exit 1)
 echo -en "${MAIN_LABEL} Found garage at: ${WHICH_GARAGE}\n"
 
+NETWORK_SECRET="$(openssl rand -hex 32)"
+
+
+# <<<<<<<<< BEGIN FOR LOOP ON NODES
 for count in $(seq 1 3); do
 CONF_PATH="/tmp/config.$count.toml"
 LABEL="\e[${FANCYCOLORS[$count]}[$count]\e[49m"
@@ -26,13 +30,10 @@ block_size = 1048576			# objects are split in blocks of maximum this number of b
 metadata_dir = "/tmp/garage-meta-$count"
 data_dir = "/tmp/garage-data-$count"
 rpc_bind_addr = "0.0.0.0:$((3900+$count))"		# the port other Garage nodes will use to talk to this node
-bootstrap_peers = [
-  "127.0.0.1:3901",
-  "127.0.0.1:3902",
-  "127.0.0.1:3903"
-]
-max_concurrent_rpc_requests = 12
+rpc_public_addr = "127.0.0.1:$((3900+$count))"
+bootstrap_peers = []
 replication_mode = "3"
+rpc_secret = "$NETWORK_SECRET"
 
 [s3_api]
 api_bind_addr = "0.0.0.0:$((3910+$count))"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
@@ -61,11 +62,21 @@ if [ -z "$SKIP_HTTPS" ]; then
   socat openssl-listen:4443,reuseaddr,fork,cert=/tmp/garagessl/test.pem,verify=0 tcp4-connect:localhost:3911 &
 fi
 
-(garage server -c /tmp/config.$count.toml 2>&1|while read r; do echo -en "$LABEL $r\n"; done) &
+(garage -c /tmp/config.$count.toml server 2>&1|while read r; do echo -en "$LABEL $r\n"; done) &
+done
+# >>>>>>>>>>>>>>>> END FOR LOOP ON NODES
+
+sleep 3
+# Establish connections between nodes
+for count in $(seq 1 3); do
+	NODE=$(garage -c /tmp/config.$count.toml node-id -q)
+	for count2 in $(seq 1 3); do
+		garage -c /tmp/config.$count2.toml node connect $NODE
+	done
 done
 
 RETRY=120
-until garage status 2>&1|grep -q Healthy ; do 
+until garage -c /tmp/config.1.toml status 2>&1|grep -q HEALTHY ; do 
   (( RETRY-- ))
   if (( RETRY <= 0 )); then 
     echo -en "${MAIN_LABEL} Garage did not start"
@@ -74,6 +85,7 @@ until garage status 2>&1|grep -q Healthy ; do
 	echo -en "${MAIN_LABEL} cluster starting...\n"
 	sleep 1
 done
+
 echo -en "${MAIN_LABEL} cluster started\n"
 
 wait
diff --git a/script/dev-configure.sh b/script/dev-configure.sh
index fdae959b..add9a96a 100755
--- a/script/dev-configure.sh
+++ b/script/dev-configure.sh
@@ -11,7 +11,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
 
 sleep 5
 RETRY=120
-until garage status 2>&1|grep -q Healthy ; do 
+until garage -c /tmp/config.1.toml status 2>&1|grep -q HEALTHY ; do 
   (( RETRY-- ))
   if (( RETRY <= 0 )); then
     echo "garage did not start in time, failing."
@@ -21,10 +21,10 @@ until garage status 2>&1|grep -q Healthy ; do
 	sleep 1
 done
 
-garage status \
-	| grep UNCONFIGURED \
+garage -c /tmp/config.1.toml status \
+	| grep 'NO ROLE' \
 	| grep -Po '^[0-9a-f]+' \
 	| while read id; do 
-	  garage node configure -z dc1 -c 1 $id
+	  garage -c /tmp/config.1.toml node configure -z dc1 -c 1 $id
 	done
 
diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index 335d55e9..86bbe3ee 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -17,13 +17,14 @@ SKIP_DUCK=1
 echo "⏳ Setup"
 ${SCRIPT_FOLDER}/dev-clean.sh
 ${SCRIPT_FOLDER}/dev-cluster.sh > /tmp/garage.log 2>&1 &
+sleep 6
 ${SCRIPT_FOLDER}/dev-configure.sh
 ${SCRIPT_FOLDER}/dev-bucket.sh
 
 which garage
-garage status
-garage key list
-garage bucket list
+garage -c /tmp/config.1.toml status
+garage -c /tmp/config.1.toml key list
+garage -c /tmp/config.1.toml bucket list
 
 dd if=/dev/urandom of=/tmp/garage.1.rnd bs=1k count=2 # No multipart, inline storage (< INLINE_THRESHOLD = 3072 bytes)
 dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 # No multipart but file will be chunked
@@ -116,9 +117,9 @@ if [ -z "$SKIP_AWS" ]; then
   echo "<h1>hello world</h1>" > /tmp/garage-index.html
   aws s3 cp /tmp/garage-index.html s3://eprouvette/index.html
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-  garage bucket website --allow eprouvette
+  garage -c /tmp/config.1.toml bucket website --allow eprouvette
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 200 ]
-  garage bucket website --deny eprouvette
+  garage -c /tmp/config.1.toml bucket website --deny eprouvette
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
   aws s3 rm s3://eprouvette/index.html
   rm /tmp/garage-index.html
@@ -127,8 +128,8 @@ fi
 echo "🏁 Teardown"
 AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
-garage bucket delete --yes eprouvette
-garage key delete --yes $AWS_ACCESS_KEY_ID
+garage -c /tmp/config.1.toml bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
+garage -c /tmp/config.1.toml bucket delete --yes eprouvette
+garage -c /tmp/config.1.toml key delete --yes $AWS_ACCESS_KEY_ID
 
 echo "✅ Success"