working install

conf/garage.toml

@@ -1,5 +1,5 @@
-metadata_dir = "/opt/yunohost/__APP_NAME__/metadata"
-data_dir = "__DATA_DIR__" 
+metadata_dir = "/opt/yunohost/__APP__/metadata"
+data_dir = "__DATADIR__" 
 
 block_size = 1048576
 block_manager_background_tranquility = 2
@@ -10,14 +10,13 @@ compression_level = 1
 
 # openssl rand -hex 32
 rpc_secret = "__RPC_SECRET__"
-# LE PORT DOIT ÊTRE LE MÊME SUR TOUS LES NOEUDS (port interne)
 rpc_bind_addr = "[::]:__PORT__"
 # Le port peut être différent (eg NAT) mais doit rediriger sur le
 # port de rpc_bind_addr
-rpc_public_addr = "__IP__:__PORT__"
+#rpc_public_addr = "__IP__:__PORT__"
 
 bootstrap_peers = [
-    __SERVER_AMI__",
+    __BOOTSTRAP_PEERS_VAR__
 ]
 
 [s3_api]
@@ -27,7 +26,7 @@ api_bind_addr = "[::]:__PORT_API__"
 s3_region = "garage"
 
 [s3_web]
-bind_addr = "[::]:__PORT_WEB"
+bind_addr = "[::]:__PORT_WEB__"
 root_domain = ".web.garage.localhost"
 index = "index.html"
 

conf/mount_disk.sh

@@ -1,16 +1,19 @@
 #!/bin/bash
-datadir=$1
-format=$2
-i=0
-while $(fdisk -l /dev/nbd$i  1&>2 /dev/null)
-do
-	i=$(( i + 1 ))
-done
-echo $i
-modprobe nbd max_part=$(( i + 1 ))
-qemu-nbd --connect /dev/nbd$i $datadir/garage.qcow2
-if [[ "$format" = "true" ]]
+if [ "$VIRTUALISATION" = "true" ] 
 then
-    mkfs.ext4 /dev/nbd$i > /dev/null
+    datadir=__DATADIR__
+    format=$1
+    i=0
+    while $(fdisk -l /dev/nbd$i  1&>2 /dev/null)
+    do
+        i=$(( i + 1 ))
+    done
+    echo $i
+    modprobe nbd max_part=$(( i + 1 ))
+    qemu-nbd --connect /dev/nbd$i $datadir/garage.qcow2
+    if [[ "$format" = "true" ]]
+    then
+        mkfs.ext4 /dev/nbd$i > /dev/null
+    fi
+    mount /dev/nbd$i $datadir/data/
 fi
-mount /dev/nbd$i $datadir/data/

conf/systemd.service

@@ -5,12 +5,10 @@ Wants=network-online.target
 
 [Service]
 User=__APP__
-Environment='RUST_LOG=garage=info' 'RUST_BACKTRACE=1'
-ExecStartPre=+__FINALPATH__/mount_disk.sh __FINALPATH__ __NBD_INDEX__
+Environment='RUST_LOG=garage=info' 'VIRTUALISATION=__VIRTUALISATION__'   'RUST_BACKTRACE=1'
+ExecStartPre=+__FINALPATH__/mount_disk.sh 
 ExecStart=__FINALPATH__/garage -c __FINALPATH__/garage.toml server
-StateDirectory=garage
-DynamicUser=true
-ProtectHome=true
+WorkingDirectory=__FINALPATH__/
 NoNewPrivileges=true
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
@@ -21,7 +19,7 @@ StandardError=inherit
 # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
 PrivateTmp=yes
 PrivateDevices=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+# RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 RestrictNamespaces=yes
 RestrictRealtime=yes
 DevicePolicy=closed

conf/umount_disk.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
-nbd=$1
-umount  /dev/nbd$nbd
-qemu-nbd --disconnect  /dev/nbd$nbd
+if [ "$VIRTUALISATION" = "true" ] 
+then
+    nbd=__NBD_INDEX__
+    umount  /dev/nbd$nbd
+    qemu-nbd --disconnect  /dev/nbd$nbd
+fi