fix blocksync not resyncing compressed blocs properly

set_extension don't behave verywell with extensions containing multiple dots

.drone.yml

@@ -6,122 +6,93 @@ workspace:
   base: /drone/garage
 
 volumes:
-- name: nix_store
-  host:
-    path: /var/lib/drone/nix
-- name: nix_config
+- name: cargo_home
   temp: {}
 
-environment:
-  HOME: /drone/garage
-
 steps:
-  - name: setup nix
-    image: nixpkgs/nix:nixos-21.05
+  - name: restore-cache
+    image: meltwater/drone-cache:dev
     volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - cp nix/nix.conf /etc/nix/nix.conf
-      - nix-build --no-build-output --no-out-link shell.nix --arg release false  -A inputDerivation
-
-  - name: code quality
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-shell --arg release false --run "cargo fmt -- --check"
-      - nix-shell --arg release false --run "cargo clippy -- --deny warnings"
-
-  - name: build
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-build --no-build-output --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT
-
-  - name: unit tests
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - |
-        nix-build \
-          --no-build-output \
-          --argstr target x86_64-unknown-linux-musl \
-          --argstr compileMode test
-      - ./result*/bin/garage_api*
-      - ./result*/bin/garage_model*
-      - ./result*/bin/garage_rpc*
-      - ./result*/bin/garage_table*
-      - ./result*/bin/garage_util*
-      - ./result*/bin/garage_web*
-      - ./result*/bin/garage*
-
-  - name: smoke-test
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-build --no-build-output --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT
-      - nix-shell --arg release false --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
-
-  - name: update cache
-    image: nixpkgs/nix:nixos-21.05
+    - name: cargo_home
+      path: /drone/cargo
     environment:
       AWS_ACCESS_KEY_ID:
         from_secret: cache_aws_access_key_id
       AWS_SECRET_ACCESS_KEY:
         from_secret: cache_aws_secret_access_key
-      NIX_PRIV_KEY:
-        from_secret: nix_priv_key
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - (umask 377 && echo $NIX_PRIV_KEY > /etc/nix/signing-key.sec)
-      - |
-        nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-          $(nix-store -qR --include-outputs \
-            $(nix-build --no-out-link shell.nix --arg release false -A inputDerivation))
-      - |
-        nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-          $(nix-store -qR --include-outputs \
-            $(nix-instantiate --argstr target x86_64-unknown-linux-musl --argstr compileMode test))
-      - |
-        nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-          $(nix-store -qR --include-outputs \
-            $(nix-instantiate --argstr target x86_64-unknown-linux-musl --arg release false))
+    pull: true
+    settings:
+      restore: true
+      archive_format: "gzip"
+      bucket: drone-cache
+      cache_key: '{{ .Repo.Name }}_{{ checksum "Cargo.lock" }}_{{ arch }}_{{ os }}_gzip'
+      region: garage
+      mount:
+        - '/drone/cargo'
+        - 'target'
+      path_style: true
+      endpoint: https://garage.deuxfleurs.fr
     when:
-      event:
-      - cron
+      branch:
+      - nonexistent_skip_this_step
 
-trigger:
-  event:
-  - custom
-  - push
-  - pull_request
-  - tag
-  - cron
+  - name: build
+    image: lxpz/garage_builder_amd64:1
+    volumes:
+    - name: cargo_home
+      path: /drone/cargo
+    environment:
+      CARGO_HOME: /drone/cargo
+    commands:
+      - pwd
+      - cargo fmt -- --check
+      - cargo build
 
-node:
-  nix: 1
+  - name: cargo-test
+    image: lxpz/garage_builder_amd64:1
+    volumes:
+    - name: cargo_home
+      path: /drone/cargo
+    environment:
+      CARGO_HOME: /drone/cargo
+    commands:
+      - cargo test
+
+  - name: rebuild-cache
+    image: meltwater/drone-cache:dev
+    volumes:
+    - name: cargo_home
+      path: /drone/cargo
+    environment:
+      AWS_ACCESS_KEY_ID:
+        from_secret: cache_aws_access_key_id
+      AWS_SECRET_ACCESS_KEY:
+        from_secret: cache_aws_secret_access_key
+    pull: true
+    settings:
+      rebuild: true
+      archive_format: "gzip"
+      bucket: drone-cache
+      cache_key: '{{ .Repo.Name }}_{{ checksum "Cargo.lock" }}_{{ arch }}_{{ os }}_gzip'
+      region: garage
+      mount:
+        - '/drone/cargo'
+        - 'target'
+      path_style: true
+      endpoint: https://garage.deuxfleurs.fr
+    when:
+      branch:
+      - nonexistent_skip_this_step
+
+  - name: smoke-test
+    image: lxpz/garage_builder_amd64:1
+    volumes:
+    - name: cargo_home
+      path: /drone/cargo
+    environment:
+      CARGO_HOME: /drone/cargo
+    commands:
+      - ./script/test-smoke.sh || (cat /tmp/garage.log; false)
 
 ---
 kind: pipeline
@@ -156,477 +127,8 @@ steps:
       repo:
         - Deuxfleurs/garage
 
-trigger:
-  event:
-  - custom
-  - push
-  - pull_request
-
-node:
-  nix: 1
-
----
-kind: pipeline
-type: docker
-name: release-linux-x86_64
-
-volumes:
-- name: nix_store
-  host:
-    path: /var/lib/drone/nix
-- name: nix_config
-  temp: {}
-
-environment:
-  TARGET: x86_64-unknown-linux-musl
-
-steps:
-  - name: setup nix
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - cp nix/nix.conf /etc/nix/nix.conf
-      - nix-build --no-build-output --no-out-link shell.nix -A inputDerivation
-
-  - name: build
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
-
-  - name: integration
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
-
-  - name: update cache
-    image: nixpkgs/nix:nixos-21.05
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: cache_aws_access_key_id
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: cache_aws_secret_access_key
-      NIX_PRIV_KEY:
-        from_secret: nix_priv_key
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - (umask 377 && echo $NIX_PRIV_KEY > /etc/nix/signing-key.sec)
-      - |
-        nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-          $(nix-store -qR --include-outputs \
-            $(nix-instantiate --argstr target $TARGET --arg release true))
-
-  - name: push static binary
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: garagehq_aws_access_key_id
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: garagehq_aws_secret_access_key
-    commands:
-      - nix-shell --arg rust false --arg integration false --run "to_s3"
-
-  - name: docker build and publish
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    environment:
-      DOCKER_AUTH:
-        from_secret: docker_auth
-      DOCKER_PLATFORM: "linux/amd64"
-      CONTAINER_NAME: "dxflrs/amd64_garage"
-      HOME: "/kaniko"
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
-      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --arg rust false --arg integration false --run "to_docker"
-
-
-trigger:
-  event:
-  - promote
-  - cron
-
-node:
-  nix: 1
-
-# ---
-# kind: pipeline
-# type: docker
-# name: release-linux-i686
-# 
-# volumes:
-# - name: nix_store
-#   host:
-#     path: /var/lib/drone/nix
-# - name: nix_config
-#   temp: {}
-# 
-# environment:
-#   TARGET: i686-unknown-linux-musl
-# 
-# steps:
-#   - name: setup nix
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - cp nix/nix.conf /etc/nix/nix.conf
-#       - nix-build --no-build-output --no-out-link shell.nix -A inputDerivation
-# 
-#   - name: build
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
-# 
-#   - name: integration
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
-# 
-#   - name: update cache
-#     image: nixpkgs/nix:nixos-21.05
-#     environment:
-#       AWS_ACCESS_KEY_ID:
-#         from_secret: cache_aws_access_key_id
-#       AWS_SECRET_ACCESS_KEY:
-#         from_secret: cache_aws_secret_access_key
-#       NIX_PRIV_KEY:
-#         from_secret: nix_priv_key
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - (umask 377 && echo $NIX_PRIV_KEY > /etc/nix/signing-key.sec)
-#       - |
-#         nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-#           $(nix-store -qR --include-outputs \
-#             $(nix-instantiate --argstr target $TARGET --arg release true))
-# 
-#   - name: push static binary
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     environment:
-#       AWS_ACCESS_KEY_ID:
-#         from_secret: garagehq_aws_access_key_id
-#       AWS_SECRET_ACCESS_KEY:
-#         from_secret: garagehq_aws_secret_access_key
-#     commands:
-#       - nix-shell --arg rust false --arg integration false --run "to_s3"
-# 
-#   - name: docker build and publish
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     environment:
-#       DOCKER_AUTH:
-#         from_secret: docker_auth
-#       DOCKER_PLATFORM: "linux/386"
-#       CONTAINER_NAME: "dxflrs/386_garage"
-#       HOME: "/kaniko"
-#     commands:
-#       - mkdir -p /kaniko/.docker
-#       - echo $DOCKER_AUTH > /kaniko/.docker/config.json
-#       - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-#       - nix-shell --arg rust false --arg integration false --run "to_docker"
-# 
-# trigger:
-#   event:
-#   - promote
-#   - cron
-# 
-# node:
-#   nix: 1
-
----
-kind: pipeline
-type: docker
-name: release-linux-aarch64
-
-volumes:
-- name: nix_store
-  host:
-    path: /var/lib/drone/nix
-- name: nix_config
-  temp: {}
-
-environment:
-  TARGET: aarch64-unknown-linux-musl
-
-steps:
-  - name: setup nix
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - cp nix/nix.conf /etc/nix/nix.conf
-      - nix-build --no-build-output --no-out-link ./shell.nix --arg rust false --arg integration false -A inputDerivation
-
-  - name: build
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
-
-  - name: update cache
-    image: nixpkgs/nix:nixos-21.05
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: cache_aws_access_key_id
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: cache_aws_secret_access_key
-      NIX_PRIV_KEY:
-        from_secret: nix_priv_key
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    commands:
-      - (umask 377 && echo $NIX_PRIV_KEY > /etc/nix/signing-key.sec)
-      - |
-        nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-          $(nix-store -qR --include-outputs \
-            $(nix-instantiate --argstr target $TARGET --arg release true))
-
-  - name: push static binary
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: garagehq_aws_access_key_id
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: garagehq_aws_secret_access_key
-    commands:
-      - nix-shell --arg rust false --arg integration false --run "to_s3"
-
-  - name: docker build and publish
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    - name: nix_config
-      path: /etc/nix
-    environment:
-      DOCKER_AUTH:
-        from_secret: docker_auth
-      DOCKER_PLATFORM: "linux/arm64"
-      CONTAINER_NAME: "dxflrs/arm64_garage"
-      HOME: "/kaniko"
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
-      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --arg rust false --arg integration false --run "to_docker"
-
-trigger:
-  event:
-  - promote
-  - cron
-
-node:
-  nix: 1
-
-# ---
-# kind: pipeline
-# type: docker
-# name: release-linux-armv6l
-# 
-# volumes:
-# - name: nix_store
-#   host:
-#     path: /var/lib/drone/nix
-# - name: nix_config
-#   temp: {}
-# 
-# environment:
-#   TARGET: armv6l-unknown-linux-musleabihf
-# 
-# steps:
-#   - name: setup nix
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - cp nix/nix.conf /etc/nix/nix.conf
-#       - nix-build --no-build-output --no-out-link --arg rust false --arg integration false -A inputDerivation
-# 
-#   - name: build
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT
-# 
-#   - name: update cache
-#     image: nixpkgs/nix:nixos-21.05
-#     environment:
-#       AWS_ACCESS_KEY_ID:
-#         from_secret: cache_aws_access_key_id
-#       AWS_SECRET_ACCESS_KEY:
-#         from_secret: cache_aws_secret_access_key
-#       NIX_PRIV_KEY:
-#         from_secret: nix_priv_key
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     commands:
-#       - (umask 377 && echo $NIX_PRIV_KEY > /etc/nix/signing-key.sec)
-#       - |
-#         nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-#           $(nix-store -qR --include-outputs \
-#             $(nix-instantiate --argstr target $TARGET --arg release true))
-# 
-#   - name: push static binary
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     environment:
-#       AWS_ACCESS_KEY_ID:
-#         from_secret: garagehq_aws_access_key_id
-#       AWS_SECRET_ACCESS_KEY:
-#         from_secret: garagehq_aws_secret_access_key
-#     commands:
-#       - nix-shell --arg integration false --arg rust false --run "to_s3"
-# 
-#   - name: docker build and publish
-#     image: nixpkgs/nix:nixos-21.05
-#     volumes:
-#     - name: nix_store
-#       path: /nix
-#     - name: nix_config
-#       path: /etc/nix
-#     environment:
-#       DOCKER_AUTH:
-#         from_secret: docker_auth
-#       DOCKER_PLATFORM: "linux/arm"
-#       CONTAINER_NAME: "dxflrs/arm_garage"
-#       HOME: "/kaniko"
-#     commands:
-#       - mkdir -p /kaniko/.docker
-#       - echo $DOCKER_AUTH > /kaniko/.docker/config.json
-#       - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-#       - nix-shell --arg rust false --arg integration false --run "to_docker"
-# 
-# trigger:
-#   event:
-#   - promote
-#   - cron
-# 
-# node:
-#   nix: 1
-
----
-kind: pipeline
-type: docker
-name: refresh-release-page
-
-volumes:
-- name: nix_store
-  host:
-    path: /var/lib/drone/nix
-
-steps:
-  - name: refresh-index
-    image: nixpkgs/nix:nixos-21.05
-    volumes:
-    - name: nix_store
-      path: /nix
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: garagehq_aws_access_key_id
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: garagehq_aws_secret_access_key
-    commands:
-      - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf
-      - nix-shell --arg integration false --arg rust false --run "refresh_index"
-
-depends_on:
-  - release-linux-x86_64
-  #- release-linux-i686
-  - release-linux-aarch64
-  #- release-linux-armv6l
-
-trigger:
-  event:
-  - promote
-  - cron
-
-node:
-  nix: 1
-
 ---
 kind: signature
-hmac: 1c33490cc2902564c4250a409c156683d0d549b8c9d5aee4e46d1bde4e0ccf2c
+hmac: de82026387bd09e547dbc9cc5d232fd865204b4f393d32508c50b58f8e60611d
 
 ...

Dockerfile

@@ -1,7 +1,10 @@
-FROM scratch
+FROM archlinux:latest
 
+RUN mkdir -p /garage/meta
+RUN mkdir -p /garage/data
 ENV RUST_BACKTRACE=1
 ENV RUST_LOG=garage=info
 
-COPY result/bin/garage /
-CMD [ "/garage", "server", "-c", "config.toml"]
+COPY target/release/garage.stripped /garage/garage
+
+CMD /garage/garage server -c /garage/config.toml

Makefile

@@ -1,13 +1,20 @@
-.PHONY: doc all release shell
+BIN=target/release/garage
+DOCKER=lxpz/garage_amd64
 
 all:
 	clear; cargo build
 
-doc:
-	cd doc/book; mdbook build
+$(BIN):
+	RUSTFLAGS="-C link-arg=-fuse-ld=lld -C target-cpu=x86-64 -C target-feature=+sse2" cargo build --release --no-default-features
 
-release:
-	nix-build --arg release true
+$(BIN).stripped: $(BIN)
+	cp $^ $@
+	strip $@
 
-shell:
-	nix-shell
+docker: $(BIN).stripped
+	docker pull archlinux:latest
+	docker build -t $(DOCKER):$(TAG) .
+	docker push $(DOCKER):$(TAG)
+	docker tag $(DOCKER):$(TAG) $(DOCKER):latest
+	docker push $(DOCKER):latest
+	

config.dev.toml

@@ -0,0 +1,22 @@
+block_size = 1048576			# objects are split in blocks of maximum this number of bytes
+
+metadata_dir = "/tmp/garage-meta"
+data_dir = "/tmp/garage-data"
+
+rpc_bind_addr = "[::]:3901"		# the port other Garage nodes will use to talk to this node
+
+bootstrap_peers = []
+
+max_concurrent_rpc_requests = 12
+data_replication_factor = 3
+meta_replication_factor = 3
+meta_epidemic_fanout = 3
+
+[s3_api]
+api_bind_addr = "[::1]:3900"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
+s3_region = "garage"				# set this to anything. S3 API calls will fail if they are not made against the region set here.
+
+[s3_web]
+bind_addr = "[::1]:3902"
+root_domain = ".garage.tld"
+index = "index.html"

default.nix

@@ -1,75 +0,0 @@
-{
-  system ? builtins.currentSystem,
-  release ? false,
-  target ? "x86_64-unknown-linux-musl",
-  compileMode ? null,
-  git_version ? null,
-}:
-
-with import ./nix/common.nix;
-
-let
-  crossSystem = { config = target; };
-in let
-
-  pkgs = import pkgsSrc {
-    inherit system crossSystem;
-    overlays = [ cargo2nixOverlay rustOverlay ];
-  };
-  rustDist = pkgs.buildPackages.rust-bin.stable.latest.default;
-
-  /*
-   The following complexity should be abstracted by makePackageSet' (note the final quote).
-   However its code uses deprecated features of rust-overlay that can lead to bug.
-   Instead, we build our own rustChannel object with the recommended API of rust-overlay.
-   */
-  rustChannel = rustDist // {
-    cargo = rustDist;
-    rustc = rustDist.override {
-      targets = [
-        (pkgs.rustBuilder.rustLib.realHostTriple pkgs.stdenv.targetPlatform)
-      ];
-    };
-  };
-
-  overrides = pkgs.buildPackages.rustBuilder.overrides.all ++ [
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage";
-      overrideAttrs = drv: if git_version != null then {
-        preConfigure = ''
-          ${drv.preConfigure or ""}
-          export GIT_VERSION="${git_version}"
-        '';
-      } else {};
-    })
-  ];
-
-  packageFun = import ./Cargo.nix;
-
-  rustPkgs = pkgs.rustBuilder.makePackageSet {
-    inherit packageFun rustChannel release;
-    packageOverrides = overrides;
-
-    buildRustPackages = pkgs.buildPackages.rustBuilder.makePackageSet {
-      inherit rustChannel packageFun;
-      packageOverrides = overrides;
-    };
-
-    localPatterns = [
-      /*
-       The way the default rules are written make think we match recursively, on full path, but the rules are misleading.
-       In fact, the regex is only called on root elements of the crate (and not recursively).
-       This behavior does not work well with our nested modules.
-       We tried to build a "deny list" but negative lookup ahead are not supported on Nix.
-       As a workaround, we have to register all our submodules in this allow list...
-       */
-       ''^(src|tests)''          # fixed default
-       ''.*\.(rs|toml)$''        # fixed default
-       ''^(crdt|replication|cli)''   # our crate submodules
-    ];
-  };
-
-in
-  if compileMode == "test"
-    then builtins.mapAttrs (name: value: rustPkgs.workspace.${name} { inherit compileMode; }) rustPkgs.workspace
-    else rustPkgs.workspace.garage { inherit compileMode; }

doc/book/src/SUMMARY.md

@@ -2,22 +2,23 @@
 
 [The Garage Data Store](./intro.md)
 
-- [Quick start](./quick_start/index.md)
+- [Getting Started](./getting_started/index.md)
+  - [Get a binary](./getting_started/binary.md)
+  - [Configure the daemon](./getting_started/daemon.md)
+  - [Control the daemon](./getting_started/control.md)
+  - [Configure a cluster](./getting_started/cluster.md)
+  - [Create buckets and keys](./getting_started/bucket.md)
+  - [Handle files](./getting_started/files.md)
 
 - [Cookbook](./cookbook/index.md)
-  - [Deploying Garage](./cookbook/real_world.md)
-  - [Configuring S3 clients](./cookbook/clients.md)
-  - [Hosting a website](./cookbook/website.md)
-  - [Recovering from failures](./cookbook/recovering.md)
-  - [Building from source](./cookbook/from_source.md)
-  - [Starting with Systemd](./cookbook/systemd.md)
+  - [Host a website](./cookbook/website.md)
   - [Integrate as a media backend]()
   - [Operate a cluster]()
+  - [Recovering from failures](./cookbook/recovering.md)
 
 - [Reference Manual](./reference_manual/index.md)
-  - [Garage configuration file](./reference_manual/configuration.md)
-  - [Garage CLI](./reference_manual/cli.md)
-  - [S3 compatibility status](./reference_manual/s3_compatibility.md)
+  - [Garage CLI]()
+  - [S3 API](./reference_manual/s3_compatibility.md)
 
 - [Design](./design/index.md)
   - [Related Work](./design/related_work.md)
@@ -25,9 +26,7 @@
 
 - [Development](./development/index.md)
   - [Setup your environment](./development/devenv.md)
-  - [Development scripts](./development/scripts.md)
-  - [Release process](./development/release_process.md)
+  - [Your first contribution]()
 
 - [Working Documents](./working_documents/index.md)
   - [Load Balancing Data](./working_documents/load_balancing.md)
-  - [Migrating from 0.3 to 0.4](./working_documents/migration_04.md)

doc/book/src/cookbook/clients.md

@@ -1,105 +0,0 @@
-# Configuring S3 clients to interact with Garage
-
-To configure an S3 client to interact with Garage, you will need the following
-parameters:
-
-- An **API endpoint**: this corresponds to the HTTP or HTTPS address
-  used to contact the Garage server. When runing Garage locally this will usually
-  be `http://127.0.0.1:3900`. In a real-world setting, you would usually have a reverse-proxy
-  that adds TLS support and makes your Garage server available under a public hostname
-  such as `https://garage.example.com`.
-
-- An **API access key** and its associated **secret key**. These usually look something
-  like this: `GK3515373e4c851ebaad366558` (access key),
-  `7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34` (secret key).
-  These keys are created and managed using the `garage` CLI, as explained in the
-  [quick start](../quick_start/index.md) guide.
-
-Most S3 clients can be configured easily with these parameters,
-provided that you follow the following guidelines:
-
-- **Force path style:** Garage does not support DNS-style buckets, which are now by default
-  on Amazon S3. Instead, Garage uses the legacy path-style bucket addressing.
-  Remember to configure your client to acknowledge this fact.
-
-- **Configuring the S3 region:** Garage requires your client to talk to the correct "S3 region",
-  which is set in the configuration file. This is often set just to `garage`.
-  If this is not configured explicitly, clients usually try to talk to region `us-east-1`.
-  Garage should normally redirect your client to the correct region,
-  but in case your client does not support this you might have to configure it manually.
-
-We will now provide example configurations for the most common S3 clients.
-
-## AWS CLI
-
-Export the following environment variables:
-
-```bash
-export AWS_ACCESS_KEY_ID=<access key>
-export AWS_SECRET_ACCESS_KEY=<secret key>
-export AWS_DEFAULT_REGION=<region>
-```
-
-Now invoke `aws` as follows:
-
-```bash
-aws --endpoint-url <endpoint> s3 <command...>
-```
-
-For instance: `aws --endpoint-url http://127.0.0.1:3901 s3 ls s3://my-bucket/`.
-
-## Minio client
-
-Use the following command to set an "alias", i.e. define a new S3 server to be
-used by the Minio client:
-
-```bash
-mc alias set \
-  garage \
-  <endpoint> \
-  <access key> \
-  <secret key> \
-  --api S3v4
-```
-
-Remember that `mc` is sometimes called `mcli` (such as on Arch Linux), to avoid conflicts
-with the Midnight Commander.
-
-
-## `rclone`
-
-`rclone` can be configured using the interactive assistant invoked using `rclone configure`.
-
-You can also configure `rclone` by writing directly its configuration file.
-Here is a template `rclone.ini` configuration file:
-
-```ini
-[garage]
-type = s3
-provider = Other
-env_auth = false
-access_key_id = <access key>
-secret_access_key = <secret key>
-region = <region>
-endpoint = <endpoint>
-force_path_style = true
-acl = private
-bucket_acl = private
-```
-
-## Cyberduck
-
-TODO
-
-## `s3cmd`
-
-Here is a template for the `s3cmd.cfg` file to talk with Garage:
-
-```ini
-[default]
-access_key = <access key>
-secret_key = <secret key>
-host_base = <endpoint without http(s)://>
-host_bucket = <same as host_base>
-use_https = False | True
-```

doc/book/src/cookbook/from_source.md

@@ -1,51 +0,0 @@
-# Compiling Garage from source
-
-
-Garage is a standard Rust project.
-First, you need `rust` and `cargo`.
-For instance on Debian:
-
-```bash
-sudo apt-get update
-sudo apt-get install -y rustc cargo
-```
-
-You can also use [Rustup](https://rustup.rs/) to setup a Rust toolchain easily.
-
-## Using source from `crates.io`
-
-Garage's source code is published on `crates.io`, Rust's official package repository.
-This means you can simply ask `cargo` to download and build this source code for you:
-
-```bash
-cargo install garage
-```
-
-That's all, `garage` should be in `$HOME/.cargo/bin`.
-
-You can add this folder to your `$PATH` or copy the binary somewhere else on your system.
-For instance:
-
-```bash
-sudo cp $HOME/.cargo/bin/garage /usr/local/bin/garage
-```
-
-
-## Using source from the Gitea repository
-
-The primary location for Garage's source code is the
-[Gitea repository](https://git.deuxfleurs.fr/Deuxfleurs/garage).
-
-Clone the repository and build Garage with the following commands:
-
-```bash
-git clone https://git.deuxfleurs.fr/Deuxfleurs/garage.git
-cd garage
-cargo build
-```
-
-Be careful, as this will make a debug build of Garage, which will be extremely slow!
-To make a release build, invoke `cargo build --release` (this takes much longer).
-
-The binaries built this way are found in `target/{debug,release}/garage`.
-

doc/book/src/cookbook/index.md

@@ -3,23 +3,3 @@
 A cookbook, when you cook, is a collection of recipes.
 Similarly, Garage's cookbook contains a collection of recipes that are known to works well!
 This chapter could also be referred as "Tutorials" or "Best practices".
-
-- **[Deploying Garage](real_world.md):** This page will walk you through all of the necessary
-  steps to deploy Garage in a real-world setting.
-
-- **[Configuring S3 clients](clients.md):** This page will explain how to configure
-  popular S3 clients to interact with a Garage server.
-
-- **[Hosting a website](website.md):** This page explains how to use Garage
-  to host a static website.
-
-- **[Recovering from failures](recovering.md):** Garage's first selling point is resilience
-  to hardware failures. This section explains how to recover from such a failure in the
-  best possible way.
-
-- **[Building from source](from_source.md):** This page explains how to build Garage from
-  source in case a binary is not provided for your architecture, or if you want to
-  hack with us!
-
-- **[Starting with Systemd](from_source.md):** This page explains how to run Garage
-  as a Systemd service (instead of as a Docker container).

doc/book/src/cookbook/real_world.md

@@ -1,273 +0,0 @@
-# Deploying Garage on a real-world cluster
-
-To run Garage in cluster mode, we recommend having at least 3 nodes.
-This will allow you to setup Garage for three-way replication of your data,
-the safest and most available mode proposed by Garage.
-
-We recommend first following the [quick start guide](../quick_start/index.md) in order
-to get familiar with Garage's command line and usage patterns.
-
-
-
-## Prerequisites
-
-To run a real-world deployment, make sure the following conditions are met:
-
-- You have at least three machines with sufficient storage space available.
-
-- Each machine has a public IP address which is reachable by other machines.
-  Running behind a NAT is likely to be possible but hasn't been tested for the latest version (TODO).
-
-- Ideally, each machine should have a SSD available in addition to the HDD you are dedicating
-  to Garage. This will allow for faster access to metadata and has the potential
-  to drastically reduce Garage's response times.
-
-- This guide will assume you are using Docker containers to deploy Garage on each node. 
-  Garage can also be run independently, for instance as a [Systemd service](systemd.md).
-  You can also use an orchestrator such as Nomad or Kubernetes to automatically manage
-  Docker containers on a fleet of nodes.
-
-Before deploying Garage on your infrastructure, you must inventory your machines.
-For our example, we will suppose the following infrastructure with IPv6 connectivity:
-
-| Location | Name    | IP Address | Disk Space |
-|----------|---------|------------|------------|
-| Paris    | Mercury | fc00:1::1  | 1 To       |
-| Paris    | Venus   | fc00:1::2  | 2 To       |
-| London   | Earth   | fc00:B::1  | 2 To       |
-| Brussels | Mars    | fc00:F::1  | 1.5 To     |
-
-
-
-## Get a Docker image
-
-Our docker image is currently named `lxpz/garage_amd64` and is stored on the [Docker Hub](https://hub.docker.com/r/lxpz/garage_amd64/tags?page=1&ordering=last_updated).
-We encourage you to use a fixed tag (eg. `v0.4.0`) and not the `latest` tag.
-For this example, we will use the latest published version at the time of the writing which is `v0.4.0` but it's up to you
-to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/lxpz/garage_amd64/tags?page=1&ordering=last_updated).
-
-For example:
-
-```
-sudo docker pull lxpz/garage_amd64:v0.4.0
-```
-
-## Deploying and configuring Garage
-
-On each machine, we will have a similar setup,
-especially you must consider the following folders/files:
-
-- `/etc/garage.toml`: Garage daemon's configuration (see below)
-
-- `/var/lib/garage/meta/`: Folder containing Garage's metadata,
-  put this folder on a SSD if possible
-
-- `/var/lib/garage/data/`: Folder containing Garage's data,
-  this folder will be your main data storage and must be on a large storage (e.g. large HDD)
-
-
-A valid `/etc/garage/garage.toml` for our cluster would look as follows:
-
-```toml
-metadata_dir = "/var/lib/garage/meta"
-data_dir = "/var/lib/garage/data"
-
-replication_mode = "3"
-
-rpc_bind_addr = "[::]:3901"
-rpc_public_addr = "<this node's public IP>:3901"
-rpc_secret = "<RPC secret>"
-
-[s3_api]
-s3_region = "garage"
-api_bind_addr = "[::]:3900"
-
-[s3_web]
-bind_addr = "[::]:3902"
-root_domain = ".web.garage"
-index = "index.html"
-```
-
-Check the following for your configuration files:
-
-- Make sure `rpc_public_addr` contains the public IP address of the node you are configuring.
-  This parameter is optional but recommended: if your nodes have trouble communicating with
-  one another, consider adding it.
-
-- Make sure `rpc_secret` is the same value on all nodes. It should be a 32-bytes hex-encoded secret key.
-  You can generate such a key with `openssl rand -hex 32`.
-
-## Starting Garage using Docker
-
-On each machine, you can run the daemon with:
-
-```bash
-docker run \
-  -d \
-  --name garaged \
-  --restart always \
-  --network host \
-  -v /etc/garage.toml:/etc/garage.toml \
-  -v /var/lib/garage/meta:/var/lib/garage/meta \
-  -v /var/lib/garage/data:/var/lib/garage/data \
-  lxpz/garage_amd64:v0.4.0
-```
-
-It should be restarted automatically at each reboot.
-Please note that we use host networking as otherwise Docker containers
-can not communicate with IPv6.
-
-Upgrading between Garage versions should be supported transparently,
-but please check the relase notes before doing so!
-To upgrade, simply stop and remove this container and
-start again the command with a new version of Garage.
-
-## Controling the daemon
-
-The `garage` binary has two purposes:
-  - it acts as a daemon when launched with `garage server`
-  - it acts as a control tool for the daemon when launched with any other command
-
-Ensure an appropriate `garage` binary (the same version as your Docker image) is available in your path.
-If your configuration file is at `/etc/garage.toml`, the `garage` binary should work with no further change.
-
-You can test your `garage` CLI utility by running a simple command such as:
-
-```bash
-garage status
-```
-
-At this point, nodes are not yet talking to one another.
-Your output should therefore look like follows:
-
-```
-Mercury$ garage node-id
-==== HEALTHY NODES ====
-ID                  Hostname  Address           Tag                   Zone  Capacity
-563e1ac825ee3323…   Mercury   [fc00:1::1]:3901  NO ROLE ASSIGNED
-```
-
-
-## Connecting nodes together
-
-When your Garage nodes first start, they will generate a local node identifier
-(based on a public/private key pair).
-
-To obtain the node identifier of a node, once it is generated,
-run `garage node-id`.
-This will print keys as follows:
-
-```bash
-Mercury$ garage node-id
-563e1ac825ee3323aa441e72c26d1030d6d4414aeb3dd25287c531e7fc2bc95d@[fc00:1::1]:3901
-
-Venus$ garage node-id
-86f0f26ae4afbd59aaf9cfb059eefac844951efd5b8caeec0d53f4ed6c85f332@[fc00:1::2]:3901
-
-etc.
-```
-
-You can then instruct nodes to connect to one another as follows:
-
-```bash
-# Instruct Venus to connect to Mercury (this will establish communication both ways)
-Venus$ garage node connect 563e1ac825ee3323aa441e72c26d1030d6d4414aeb3dd25287c531e7fc2bc95d@[fc00:1::1]:3901
-```
-
-You don't nead to instruct all node to connect to all other nodes:
-nodes will discover one another transitively.
-
-Now if your run `garage status` on any node, you should have an output that looks as follows:
-
-```
-==== HEALTHY NODES ====
-ID                  Hostname  Address           Tag                   Zone  Capacity
-563e1ac825ee3323…   Mercury   [fc00:1::1]:3901  NO ROLE ASSIGNED
-86f0f26ae4afbd59…   Venus     [fc00:1::2]:3901  NO ROLE ASSIGNED
-68143d720f20c89d…   Earth     [fc00:B::1]:3901  NO ROLE ASSIGNED
-212f7572f0c89da9…   Mars      [fc00:F::1]:3901  NO ROLE ASSIGNED
-```
-
-## Giving roles to nodes
-
-We will now inform Garage of the disk space available on each node of the cluster
-as well as the zone (e.g. datacenter) in which each machine is located.
-
-For our example, we will suppose we have the following infrastructure
-(Capacity, Identifier and Zone are specific values to Garage described in the following):
-
-| Location | Name    | Disk Space | `Capacity` | `Identifier` | `Zone` |
-|----------|---------|------------|------------|--------------|--------------|
-| Paris    | Mercury | 1 To       | `2`        | `563e`     | `par1`       |
-| Paris    | Venus   | 2 To       | `4`        | `86f0`     | `par1`       |
-| London   | Earth   | 2 To       | `4`        | `6814`     | `lon1`       |
-| Brussels | Mars    | 1.5 To     | `3`        | `212f`     | `bru1`       |
-
-#### Node identifiers
-
-After its first launch, Garage generates a random and unique identifier for each nodes, such as:
-
-```
-563e1ac825ee3323aa441e72c26d1030d6d4414aeb3dd25287c531e7fc2bc95d
-```
-
-Often a shorter form can be used, containing only the beginning of the identifier, like `563e`,
-which identifies the server "Mercury" located in "Paris" according to our previous table.
-
-The most simple way to match an identifier to a node is to run:
-
-```
-garage status
-```
-
-It will display the IP address associated with each node;
-from the IP address you will be able to recognize the node.
-
-#### Zones
-
-Zones are simply a user-chosen identifier that identify a group of server that are grouped together logically.
-It is up to the system administrator deploying Garage to identify what does "grouped together" means.
-
-In most cases, a zone will correspond to a geographical location (i.e. a datacenter).
-Behind the scene, Garage will use zone definition to try to store the same data on different zones,
-in order to provide high availability despite failure of a zone.
-
-#### Capacity
-
-Garage reasons on an abstract metric about disk storage that is named the *capacity* of a node.
-The capacity configured in Garage must be proportional to the disk space dedicated to the node.
-Due to the way the Garage allocation algorithm works, capacity values must
-be **integers**, and must be **as small as possible**, for instance with
-1 representing the size of your smallest server.
-
-Here we chose that 1 unit of capacity = 0.5 To, so that we can express servers of size
-1 To and 2 To, as wel as the intermediate size 1.5 To, with the integer values 2, 4 and
-3 respectively (see table above).
-
-Note that the amount of data stored by Garage on each server may not be strictly proportional to
-its capacity value, as Garage will priorize having 3 copies of data in different zones,
-even if this means that capacities will not be strictly respected. For example in our above examples,
-nodes Earth and Mars will always store a copy of everything each, and the third copy will
-have 66% chance of being stored by Venus and 33% chance of being stored by Mercury.
-
-#### Injecting the topology
-
-Given the information above, we will configure our cluster as follow:
-
-```
-garage node configure -z par1 -c 2 -t mercury 563e
-garage node configure -z par1 -c 4 -t venus 86f0
-garage node configure -z lon1 -c 4 -t earth 6814
-garage node configure -z bru1 -c 3 -t mars 212f
-```
-
-
-## Using your Garage cluster
-
-Creating buckets and managing keys is done using the `garage` CLI,
-and is covered in the [quick start guide](../quick_start/index.md).
-Remember also that the CLI is self-documented thanks to the `--help` flag and
-the `help` subcommand (e.g. `garage help`, `garage key --help`).
-
-Configuring an S3 client to interact with Garage is covered
-[in the next section](clients.md).

doc/book/src/cookbook/recovering.md

@@ -6,18 +6,14 @@ Fear not! For Garage is fully equipped to handle drive failures, in most common
 
 ## A note on availability of Garage
 
-With nodes dispersed in 3 zones or more, here are the guarantees Garage provides with the 3-way replication strategy (3 copies of all data, which is the recommended replication mode):
+With nodes dispersed in 3 datacenters or more, here are the guarantees Garage provides with the default replication strategy (3 copies of all data, which is the recommended value):
 
-- The cluster remains fully functional as long as the machines that fail are in only one zone. This includes a whole zone going down due to power/Internet outage.
-- No data is lost as long as the machines that fail are in at most two zones.
+- The cluster remains fully functional as long as the machines that fail are in only one datacenter. This includes a whole datacenter going down due to power/Internet outage.
+- No data is lost as long as the machines that fail are in at most two datacenters.
 
-Of course this only works if your Garage nodes are correctly configured to be aware of the zone in which they are located.
+Of course this only works if your Garage nodes are correctly configured to be aware of the datacenter in which they are located.
 Make sure this is the case using `garage status` to check on the state of your cluster's configuration.
 
-In case of temporarily disconnected nodes, Garage should automatically re-synchronize
-when the nodes come back up. This guide will deal with recovering from disk failures
-that caused the loss of the data of a node.
-
 
 ## First option: removing a node
 
@@ -96,7 +92,7 @@ Then, replace the broken node by the new one, using:
 
 ```
 garage node configure --replace <old_node_id> \
-		-c <capacity> -z <zone> -t <node_tag> <new_node_id>
+		-c <capacity> -d <datacenter> -t <node_tag> <new_node_id>
 ```
 
 Garage will then start synchronizing all required data on the new node.

doc/book/src/cookbook/systemd.md

@@ -1,39 +0,0 @@
-# Starting Garage with systemd instead of Docker
-
-NOTE: This guide is incomplete. Typicall you would also want to create a separate
-Unix user to run Garage.
-
-Make sure you have the Garage binary installed on your system (see [quick start](../quick_start/index.md)), e.g. at `/usr/local/bin/garage`.
-
-Create a file named `/etc/systemd/system/garage.service`:
-
-```toml
-[Unit]
-Description=Garage Data Store
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Environment='RUST_LOG=garage=info' 'RUST_BACKTRACE=1'
-ExecStart=/usr/local/bin/garage server -c /etc/garage/garage.toml
-
-[Install]
-WantedBy=multi-user.target
-```
-
-To start the service then automatically enable it at boot:
-
-```bash
-sudo systemctl start garage
-sudo systemctl enable garage
-```
-
-To see if the service is running and to browse its logs:
-
-```bash
-sudo systemctl status garage
-sudo journalctl -u garage
-```
-
-If you want to modify the service file, do not forget to run `systemctl daemon-reload`
-to inform `systemd` of your modifications.

doc/book/src/cookbook/website.md

@@ -1,3 +1 @@
-# Hosting a website
-
-TODO
+# Host a website

doc/book/src/development/devenv.md

@@ -1,145 +1,17 @@
 # Setup your development environment
 
-Depending on your tastes, you can bootstrap your development environment in a traditional Rust way or through Nix.
+We propose the following quickstart to setup a full dev. environment as quickly as possible:
 
-## The Nix way
+  1. Setup a rust/cargo environment. eg. `dnf install rust cargo`
+  2. Install awscli v2 by following the guide [here](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html).
+  3. Run `cargo build` to build the project
+  4. Run `./script/dev-cluster.sh` to launch a test cluster (feel free to read the script)
+  5. Run `./script/dev-configure.sh` to configure your test cluster with default values (same datacenter, 100 tokens)
+  6. Run `./script/dev-bucket.sh` to create a bucket named `eprouvette` and an API key that will be stored in `/tmp/garage.s3`
+  7. Run `source ./script/dev-env-aws.sh` to configure your CLI environment
+  8. You can use `garage` to manage the cluster. Try `garage --help`.
+  9. You can use the `awsgrg` alias to add, remove, and delete files. Try `awsgrg help`, `awsgrg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `awsgrg ls s3://eprouvette`. `awsgrg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint.
 
-Nix is a generic package manager we use to precisely define our development environment.
-Instructions on how to install it are given on their [Download page](https://nixos.org/download.html).
+Now you should be ready to start hacking on garage!
 
-Check that your installation is working by running the following commands:
 
-```
-nix-shell --version
-nix-build --version
-nix-env   --version
-```
-
-Now, you can clone our git repository (run `nix-env -iA git` if you do not have git yet):
-
-```bash
-git clone https://git.deuxfleurs.fr/Deuxfleurs/garage
-cd garage
-```
-
-*Optionnaly, you can use our nix.conf file to speed up compilations:*
-
-```bash
-sudo mkdir -p /etc/nix
-sudo cp nix/nix.conf /etc/nix/nix.conf
-sudo killall nix-daemon
-```
-
-Now you can enter our nix-shell, all the required packages will be downloaded but they will not pollute your environment outside of the shell:
-
-```bash
-nix-shell
-```
-
-You can use the traditionnal Rust development workflow:
-
-```bash
-cargo build  # compile the project
-cargo run    # execute the project
-cargo test   # run the tests
-cargo fmt    # format the project, run it before any commit!
-cargo clippy # run the linter, run it before any commit!
-```
-
-You can build the project with Nix by running:
-
-```bash
-nix-build
-```
-
-You can parallelize the build (if you use our nix.conf file, it is already automatically done).
-To use all your cores when building a derivation use `-j`, and to build multiple derivations at once use `--max-jobs`.
-The special value `auto` will be replaced by the number of cores of your computer.
-An example:
-
-```bash
-nix-build -j $(nproc) --max-jobs auto
-```
-
-Our build has multiple parameters you might want to set:
-  - `release` build with release optimisations instead of debug
-  - `target allows` for cross compilation
-  - `compileMode` can be set to test or bench to build a unit test runner
-  - `git_version` to inject the hash to display when running `garage stats`
-
-An example:
-
-```bash
-nix-build \
-  --arg release true \
-  --argstr target x86_64-unknown-linux-musl \
-  --argstr compileMode build \
-  --git_version $(git rev-parse HEAD)
-```
-
-*The result is located in `result/bin`. You can pass arguments to cross compile: check `.drone.yml` for examples.*
-
-If you modify a `Cargo.toml` or regenerate any `Cargo.lock`, you must run `cargo2nix`:
-
-```
-cargo2nix -f
-```
-
-Many tools like rclone, `mc` (minio-client), or `aws` (awscliv2) will be available in your environment and will be useful to test Garage.
-
-**This is the recommended method.**
-
-## The Rust way
-
-You need a Rust distribution installed on your computer.
-The most simple way is to install it from [rustup](https://rustup.rs).
-Please avoid using your package manager to install Rust as some tools might be outdated or missing.
-
-Now, check your Rust distribution works by running the following commands:
-
-```bash
-rustc --version
-cargo --version
-rustfmt --version
-clippy-driver --version
-```
-
-Now, you need to clone our git repository ([how to install git](https://git-scm.com/downloads)):
-
-```bash
-git clone https://git.deuxfleurs.fr/Deuxfleurs/garage
-cd garage
-```
-
-You can now use the following commands:
-
-```bash
-cargo build  # compile the project
-cargo run    # execute the project
-cargo test   # run the tests
-cargo fmt    # format the project, run it before any commit!
-cargo clippy # run the linter, run it before any commit!
-```
-
-This is specific to our project, but you will need one last tool, `cargo2nix`.
-To install it, run:
-
-```bash
-cargo install --git https://github.com/superboum/cargo2nix --branch main cargo2nix
-```
-
-You must use it every time you modify a `Cargo.toml` or regenerate a `Cargo.lock` file as follow:
-
-```bash
-cargo build  # Rebuild Cargo.lock if needed
-cargo2nix -f
-```
-
-It will output a `Cargo.nix` file which is a specific `Cargo.lock` file dedicated to Nix that is required by our CI
-which means you must include it in your commits.
-
-Later, to use our scripts and integration tests, you might need additional tools.
-These tools are listed at the end of the `shell.nix` package in the `nativeBuildInputs` part.
-It is up to you to find a way to install the ones you need on your computer.
-
-**A global drawback of this method is that it is up to you to adapt your environment to the one defined in the Nix files.**

doc/book/src/development/miscellaneous_notes.md

@@ -1,134 +0,0 @@
-# Miscellaneous Notes
-
-## Quirks about cargo2nix/rust in Nix
-
-If you use submodules in your crate (like `crdt` and `replication` in `garage_table`), you must list them in `default.nix`
-
-The Windows target does not work. it might be solvable through [overrides](https://github.com/cargo2nix/cargo2nix/blob/master/overlay/overrides.nix). Indeed, we pass `x86_64-pc-windows-gnu` but mingw need `x86_64-w64-mingw32`
-
-We have a simple [PR on cargo2nix](https://github.com/cargo2nix/cargo2nix/pull/201) that fixes critical bugs but the project does not seem very active currently. We must use [my patched version of cargo2nix](https://github.com/superboum/cargo2nix) to enable i686 and armv6l compilation. We might need to contribute to cargo2nix in the future.
-
-
-## Nix
-
-Nix has no armv7 + musl toolchains but armv7l is backward compatible with armv6l.
-
-Signing keys are generated with: 
-
-```
-nix-store --generate-binary-cache-key nix.web.deuxfleurs.fr cache-priv-key.pem cache-pub-key.pem
-```
-
-We copy the secret key in our nix folder:
-
-```
-cp cache-priv-key.pem /etc/nix/signing-key.sec
-```
-
-Manually sign
-    
-We can sign the whole store with:
-
-```
-nix sign-paths --all -k /etc/nix/signing-key.sec
-```
-
-Or simply the current package and its dependencies with:
-
-```
-nix sign-paths --recursive -k /etc/nix/signing-key.sec
-```
-
-Setting a key in `nix.conf` will do the signature at build time automatically without additional commands, edit the `nix.conf` of your builder:
-
-```toml
-secret-key-files = /etc/nix/signing-key.sec
-max-jobs = auto
-cores = 8
-```
-
-Now you are ready to build your packages: 
-
-```bash
-cat > $HOME/.awsrc <<EOF
-export AWS_ACCESS_KEY_ID="xxx"
-export AWS_SECRET_ACCESS_KEY="xxx"
-EOF
-
-# source each time you want to send on the cache
-source ~/.awsrc
-
-# copy garage build dependencies (and not only the output)
-nix-build
-nix-store -qR --include-outputs $(nix-instantiate default.nix) 
-  | xargs nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage'
-  
-# copy shell dependencies
-nix-build shell.nix -A inputDerivation
-nix copy $(nix-store -qR result/) --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage' 
-```
-
-More example of nix-copy
-
-```
-# nix-build produces a result/ symlink
-nix copy result/ --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage'
-
-# alternative ways to use nix copy
-nix copy nixpkgs.garage --to ...
-nix copy /nix/store/3rbb9qsc2w6xl5xccz5ncfhy33nzv3dp-crate-garage-0.3.0 --to ...
-```
-    
-
-Clear the cache:
-
-```bash
-mc rm --recursive --force garage/nix/
-```
-
----
-
-A desirable `nix.conf` for a consumer:
-
-```toml
-substituters = https://cache.nixos.org https://nix.web.deuxfleurs.fr
-trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix.web.deuxfleurs.fr:eTGL6kvaQn6cDR/F9lDYUIP9nCVR/kkshYfLDJf1yKs=
-```
-
-And now, whenever you run a command like:
-
-```
-nix-shell
-nix-build
-```
-
-Our cache will be checked.
-
-### Some references about Nix
-
-
- - https://doc.rust-lang.org/nightly/rustc/platform-support.html
- - https://nix.dev/tutorials/cross-compilation
- - https://nixos.org/manual/nix/unstable/package-management/s3-substituter.html
- - https://fzakaria.com/2020/09/28/nix-copy-closure-your-nix-shell.html
- - http://www.lpenz.org/articles/nixchannel/index.html
-
-
-## Drone
-
-Do not try to set a build as trusted from the interface or the CLI tool,
-your request would be ignored. Instead, directly edit the database (table `repos`, column `repo_trusted`).
-
-Drone can do parallelism both at the step and the pipeline level. At the step level, parallelism is restricted to the same runner.
-
-## Building Docker containers
-
-We were:
-  - Unable to use the official Docker plugin because
-    - it requires to mount docker socket in the container but it is not recommended
-    - you cant set the platform when building
-  - Unable to use buildah because it needs `CLONE_USERNS` capability
-  - Unable to use the kaniko plugin for Drone as we can't set the target platform
-  - Unable to use the kaniko container provided by Google as we can't run arbitrary logic: we need to put our secret in .docker/config.json.
-
-Finally we chose to build kaniko through nix and use it in a `nix-shell`.

doc/book/src/development/release_process.md

@@ -1,184 +0,0 @@
-# Release process
-
-Before releasing a new version of Garage, our code pass through a succession of checks and transformations.
-We define them as our release process.
-
-## Trigger and classify a release
-
-While we run some tests on every commits, we do not make a release for all of them.
-
-A release can be triggered manually by "promoting" a successful build.
-Otherwise, every weeks, a release build is triggered on the `main` branch.
-
-If the build is from a tag following the regex: `v[0-9]+\.[0-9]+\.[0-9]+`, it will be listed as stable.
-If it is a tag but with a different format, it will be listed as Extra.
-Otherwise, if it is a commit, it will be listed as development.
-This logic is defined in `nix/build_index.nix`.
-
-## Testing
-
-For each commit, we first pass the code to a formatter (rustfmt) and a linter (clippy).
-Then we try to build it in debug mode and run both unit tests and our integration tests.
-
-Additionnaly, when releasing, our integration tests are run on the release build for amd64 and i686.
-
-## Generated Artifacts
-
-We generate the following binary artifacts for now:
-  - **architecture**: amd64, i686, aarch64, armv6
-  - **os**: linux
-  - **format**: static binary, docker container
-
-Additionnaly we also build two web pages:
-  - the documentation (this website)
-  - [the release page](https://garagehq.deuxfleurs.fr/releases.html)
-
-We publish the static binaries on our own garage cluster (you can access them through the releases page)
-and the docker containers on Docker Hub.
-
-## Automation
-
-We automated our release process with Nix and Drone to make it more reliable.
-Here we describe how we have done in case you want to debug or improve it.
-
-### Caching build steps
-
-To speed up the CI, we use the caching feature provided by Nix.
-
-You can benefit from it by using our provided `nix.conf` as recommended or by simply adding the following lines to your file:
-
-```toml
-substituters = https://cache.nixos.org https://nix.web.deuxfleurs.fr
-trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix.web.deuxfleurs.fr:eTGL6kvaQn6cDR/F9lDYUIP9nCVR/kkshYfLDJf1yKs=
-```
-
-Sending to the cache is done through `nix copy`, for example:
-
-```bash
-nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' result
-```
-
-*Note that you need the signing key. In our case, it is stored as a secret in Drone.*
-
-The previous command will only send the built packet and not its dependencies.
-To send its dependency, a tool named `nix-copy-closure` has been created but it is not compatible with the S3 protocol.
-
-Instead, you can use the following commands to list all the runtime dependencies:
-
-```bash
-nix copy \
-  --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-  $(nix-store -qR result/)
-```
-
-*We could also write this expression with xargs but this tool is not available in our container.*
-
-But in certain cases, we want to cache compile time dependencies also.
-For example, the Nix project does not provide binaries for cross compiling to i686 and thus we need to compile gcc on our own.
-We do not want to compile gcc each time, so even if it is a compile time dependency, we want to cache it.
-
-This time, the command is a bit more involved:
-
-```bash
-nix copy --to \
-  's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-   $(nix-store -qR --include-outputs \
-     $(nix-instantiate))
-```
-
-This is the command we use in our CI as we expect the final binary to change, so we mainly focus on
-caching our development dependencies.
-
-*Currently there is no automatic garbage collection of the cache: we should monitor its growth.
-Hopefully, we can erase it totally without breaking any build, the next build will only be slower.*
-
-To erase the cache:
-
-```
-mc rm --recursive --force 'garage/nix/*'
-```
-
-### Publishing Garage
-
-We defined our publishing logic in Nix, mostly as shell hooks.
-You can inspect them in `shell.nix` to see exactly how.
-Here, we will give a quick explanation on how to use them to manually publish a release.
-
-Supposing you just have built garage as follow:
-
-```bash
-nix-build --arg release true
-```
-
-To publish a static binary in `result/bin` on garagehq, run:
-
-```bash
-export AWS_ACCESS_KEY_ID=xxx
-export AWS_SECRET_ACCESS_KEY=xxx
-export DRONE_TAG=handcrafted-1.0.0 # or DRONE_COMMIT
-export TARGET=x86_64-unknown-linux-musl
-
-nix-shell --run to_s3
-```
-
-To create and publish a docker container, run:
-
-```bash
-export DOCKER_AUTH='{ "auths": { "https://index.docker.io/v1/": { "auth": "xxxx" }}}'
-export DOCKER_PLATFORM='linux/amd64' # check GOARCH and GOOS from golang.org
-export CONTAINER_NAME='me/amd64_garage'
-export CONTAINER_TAG='handcrafted-1.0.0'
-
-nix-shell --run to_docker
-```
-
-To rebuild the release page, run:
-```bash
-export AWS_ACCESS_KEY_ID=xxx
-export AWS_SECRET_ACCESS_KEY=xxx
-
-nix-shell --run refresh_index
-```
-
-If you want to compile for different architectures, you will need to repeat all these commands for each architecture.
-
-**In practise, and except for debugging, you will never directly run these commands. Release is handled by drone**
-
-### Drone
-
-Our instance is available at [https://drone.deuxfleurs.fr](https://drone.deuxfleurs.fr).  
-You need an account on [https://git.deuxfleurs.fr](https://git.deuxfleurs.fr) to use it.
-
-**Drone CLI** - Drone has a CLI tool to interact with.
-It can be downloaded from its Github [release page](https://github.com/drone/drone-cli/releases).
-
-To communicate with our instance, you must setup some environment variables.
-You can get them from your [Account Settings](https://drone.deuxfleurs.fr/account).
-
-To make drone easier to use, you could create a `~/.dronerc` that you could source each time you want to use it.
-
-```
-export DRONE_SERVER=https://drone.deuxfleurs.fr
-export DRONE_TOKEN=xxx
-drone info
-```
-
-The CLI tool is very self-discoverable, just append `--help` to each subcommands.
-Start with:
-
-```bash
-drone --help
-```
-
-**.drone.yml** - The builds steps are defined in `.drone.yml`.  
-You can not edit this file without resigning it.
-
-To sign it, you must be a maintainer and then run:
-
-```bash
-drone sign --save Deuxfleurs/garage
-```
-
-Looking at the file, you will see that most of the commands are `nix-shell` and `nix-build` commands with various parameters.
-
-

doc/book/src/development/scripts.md

@@ -1,113 +0,0 @@
-# Development scripts
-
-We maintain a `script/` folder that contains some useful script to ease testing on Garage.
-
-A fully integrated script, `test-smoke.sh`, runs some basic tests on various tools such as minio client, awscli and rclone.
-To run it, enter a `nix-shell` (or install all required tools) and simply run:
-
-```bash
-nix-build # or cargo build
-./script/test-smoke.sh
-```
-
-If something fails, you can find useful logs in `/tmp/garage.log`.
-You can inspect the generated configuration and local data created by inspecting your `/tmp` directory:
-the script creates files and folder prefixed with the name "garage".
-
-## Bootstrapping a test cluster
-
-Under the hood `test-smoke.sh` uses multiple helpers scripts you can also run in case you want to manually test Garage.
-In this section, we introduce 3 scripts to quickly bootstrap a full test cluster with 3 instances.
-
-### 1. Start each daemon
-
-```bash
-./script/dev-cluster.sh
-```
-
-This script spawns 3 Garage instances with 3 configuration files.
-You can inspect the detailed configuration, including ports, by inspecting `/tmp/config.1` (change 1 by the instance number you want).
-
-This script also spawns a simple HTTPS reverse proxy through `socat` for the S3 endpoint that listens on port `4443`.
-Some libraries might require a TLS endpoint to work, refer to our issue [#64](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/64) for more detailed information on this subject.
-
-This script covers the [Launching the garage server](/quick_start/index.html#launching-the-garage-server) section of our Quick start page.
-
-### 2. Make them join the cluster
-
-```bash
-./script/dev-configure.sh
-```
-
-This script will configure each instance by assigning them a zone (`dc1`) and a weight (`1`).
-
-This script covers the [Configuring your Garage node](/quick_start/index.html#configuring-your-garage-node) section of our Quick start page.
-
-### 3. Create a key and a bucket
-
-```bash
-./script/dev-bucket.sh
-```
-
-This script will create a bucket named `eprouvette` with a key having read and write rights on this bucket.
-The key is stored in a filed named `/tmp/garage.s3` and can be used by the following tools to pre-configure them.
-
-This script covers the [Creating buckets and keys](/quick_start/index.html#creating-buckets-and-keys) section of our Quick start page.
-
-## Handlers for generic tools
-
-We provide wrappers for some CLI tools that configure themselves for your development cluster.
-They are meant to save you some configuration time as to use them, you are only required to source the right file.
-
-### awscli
-
-```bash
-source ./script/dev-env-aws.sh
-
-# some examples
-aws s3 ls s3://eprouvette
-aws s3 cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt
-```
-
-### minio-client
-
-
-```bash
-source ./script/dev-env-mc.sh
-
-# some examples
-mc ls garage/
-mc cp /proc/cpuinfo garage/eprouvette/cpuinfo.txt
-```
-
-### rclone
-
-```bash
-source ./script/dev-env-rclone.sh
-
-# some examples
-rclone lsd garage:
-rclone copy /proc/cpuinfo garage:eprouvette/cpuinfo.txt
-```
-
-### s3cmd
-
-```bash
-source ./script/dev-env-s3cmd.sh
-
-# some examples
-s3cmd ls
-s3cmd put /proc/cpuinfo s3://eprouvette/cpuinfo.txt
-```
-
-### duck
-
-*Warning! Duck is not yet provided by nix-shell.*
-
-```bash
-source ./script/dev-env-duck.sh
-
-# some examples
-duck --list garage:/
-duck --upload garage:/eprouvette/ /proc/cpuinfo
-```

doc/book/src/getting_started/binary.md

@@ -0,0 +1,44 @@
+# Get a binary
+
+Currently, only two installations procedures are supported for Garage: from Docker (x86\_64 for Linux) and from source.
+In the future, we plan to add a third one, by publishing a compiled binary (x86\_64 for Linux).
+We did not test other architecture/operating system but, as long as your architecture/operating system is supported by Rust, you should be able to run Garage (feel free to report your tests!).
+
+## From Docker
+
+Our docker image is currently named `lxpz/garage_amd64` and is stored on the [Docker Hub](https://hub.docker.com/r/lxpz/garage_amd64/tags?page=1&ordering=last_updated).
+We encourage you to use a fixed tag (eg. `v0.2.1`) and not the `latest` tag.
+For this example, we will use the latest published version at the time of the writing which is `v0.2.1` but it's up to you
+to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/lxpz/garage_amd64/tags?page=1&ordering=last_updated).
+
+For example:
+
+```
+sudo docker pull lxpz/garage_amd64:v0.2.1
+```
+
+## From source
+
+Garage is a standard Rust project.
+First, you need `rust` and `cargo`.
+On Debian:
+
+```bash
+sudo apt-get update
+sudo apt-get install -y rustc cargo
+```
+
+Then, you can ask cargo to install the binary for you:
+
+```bash
+cargo install garage
+```
+
+That's all, `garage` should be in `$HOME/.cargo/bin`.
+You can add this folder to your `$PATH` or copy the binary somewhere else on your system.
+For the following, we will assume you copied it in `/usr/local/bin/garage`:
+
+```bash
+sudo cp $HOME/.cargo/bin/garage /usr/local/bin/garage
+```
+

doc/book/src/getting_started/bucket.md

@@ -0,0 +1,74 @@
+# Create buckets and keys
+
+*We use a command named `garagectl` which is in fact an alias you must define as explained in the [Control the daemon](./daemon.md) section.*
+
+In this section, we will suppose that we want to create a bucket named `nextcloud-bucket`
+that will be accessed through a key named `nextcloud-app-key`.
+
+Don't forget that `help` command and `--help` subcommands can help you anywhere, the CLI tool is self-documented! Two examples:
+
+```
+garagectl help
+garagectl bucket allow --help
+```
+
+## Create a bucket
+
+Fine, now let's create a bucket (we imagine that you want to deploy nextcloud):
+
+```
+garagectl bucket create nextcloud-bucket
+```
+
+Check that everything went well:
+
+```
+garagectl bucket list
+garagectl bucket info nextcloud-bucket
+```
+
+## Create an API key
+
+Now we will generate an API key to access this bucket.
+Note that API keys are independent of buckets: one key can access multiple buckets, multiple keys can access one bucket.
+
+Now, let's start by creating a key only for our PHP application:
+
+```
+garagectl key new --name nextcloud-app-key
+```
+
+You will have the following output (this one is fake, `key_id` and `secret_key` were generated with the openssl CLI tool):
+
+```
+Key name: nextcloud-app-key
+Key ID: GK3515373e4c851ebaad366558
+Secret key: 7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34
+Authorized buckets:
+```
+
+Check that everything works as intended:
+
+```
+garagectl key list
+garagectl key info nextcloud-app-key
+```
+
+## Allow a key to access a bucket
+
+Now that we have a bucket and a key, we need to give permissions to the key on the bucket!
+
+```
+garagectl bucket allow \
+  --read \
+  --write 
+  nextcloud-bucket \
+  --key nextcloud-app-key
+```
+
+You can check at any times allowed keys on your bucket with:
+
+```
+garagectl bucket info nextcloud-bucket
+```
+

doc/book/src/getting_started/cluster.md

@@ -0,0 +1,73 @@
+# Configure a cluster
+
+*We use a command named `garagectl` which is in fact an alias you must define as explained in the [Control the daemon](./daemon.md) section.*
+
+In this section, we will inform garage of the disk space available on each node of the cluster
+as well as the site (think datacenter) of each machine.
+
+## Test cluster
+
+As this part is not relevant for a test cluster, you can use this one-liner to create a basic topology:
+
+```bash
+garagectl status | grep UNCONFIGURED | grep -Po '^[0-9a-f]+' | while read id; do 
+    garagectl node configure -d dc1 -c 1 $id
+done
+```
+
+## Real-world cluster
+
+For our example, we will suppose we have the following infrastructure (Capacity, Identifier and Datacenter are specific values to garage described in the following):
+
+| Location | Name    | Disk Space | `Capacity` | `Identifier` | `Datacenter` |
+|----------|---------|------------|------------|--------------|--------------|
+| Paris    | Mercury | 1 To       | `2`        | `8781c5`     | `par1`       |
+| Paris    | Venus   | 2 To       | `4`        | `2a638e`     | `par1`       |
+| London   | Earth   | 2 To       | `4`        | `68143d`     | `lon1`       |
+| Brussels | Mars    | 1.5 To     | `3`        | `212f75`     | `bru1`       |
+
+### Identifier
+
+After its first launch, garage generates a random and unique identifier for each nodes, such as:
+
+```
+8781c50c410a41b363167e9d49cc468b6b9e4449b6577b64f15a249a149bdcbc
+```
+
+Often a shorter form can be used, containing only the beginning of the identifier, like `8781c5`,
+which identifies the server "Mercury" located in "Paris" according to our previous table.
+
+The most simple way to match an identifier to a node is to run:
+
+```
+garagectl status
+```
+
+It will display the IP address associated with each node; from the IP address you will be able to recognize the node.
+
+### Capacity
+
+Garage reasons on an arbitrary metric about disk storage that is named the *capacity* of a node.
+The capacity configured in Garage must be proportional to the disk space dedicated to the node.
+Additionaly, the capacity values used in Garage should be as small as possible, with
+1 ideally representing the size of your smallest server.
+
+Here we chose that 1 unit of capacity = 0.5 To, so that we can express servers of size
+1 To and 2 To, as wel as the intermediate size 1.5 To.
+
+### Datacenter
+
+Datacenter are simply a user-chosen identifier that identify a group of server that are located in the same place.
+It is up to the system administrator deploying garage to identify what does "the same place" means.
+Behind the scene, garage will try to store the same data on different sites to provide high availability despite a data center failure.
+
+### Inject the topology
+
+Given the information above, we will configure our cluster as follow:
+
+```
+garagectl node configure --datacenter par1 -c 2 -t mercury 8781c5
+garagectl node configure --datacenter par1 -c 4 -t venus 2a638e
+garagectl node configure --datacenter lon1 -c 4 -t earth 68143d
+garagectl node configure --datacenter bru1 -c 3 -t mars 212f75
+```

doc/book/src/getting_started/control.md

@@ -0,0 +1,77 @@
+# Control the daemon
+
+The `garage` binary has two purposes:
+  - it acts as a daemon when launched with `garage server ...`
+  - it acts as a control tool for the daemon when launched with any other command
+
+In this section, we will see how to use the `garage` binary as a control tool for the daemon we just started.
+You first need to get a shell having access to this binary, which depends of your configuration:
+  - with `docker-compose`, run `sudo docker-compose exec g1 bash` then `/garage/garage`
+  - with `docker`, run `sudo docker exec -ti garaged bash` then `/garage/garage`
+  - with `systemd`, simply run `/usr/local/bin/garage` if you followed previous instructions
+
+*You can also install the binary on your machine to remotely control the cluster.*
+
+## Talk to the daemon and create an alias
+
+`garage` requires 4 options to talk with the daemon:
+
+```
+--ca-cert <ca-cert>            
+--client-cert <client-cert>    
+--client-key <client-key>      
+-h, --rpc-host <rpc-host>
+```
+
+The 3 first ones are certificates and keys needed by TLS, the last one is simply the address of garage's RPC endpoint.
+Because we configure garage directly from the server, we do not need to set `--rpc-host`.
+To avoid typing the 3 first options each time we want to run a command, we will create an alias.
+
+### `docker-compose` alias
+
+```bash
+alias garagectl='/garage/garage \
+  --ca-cert /pki/garage-ca.crt \
+  --client-cert /pki/garage.crt \
+  --client-key /pki/garage.key'
+```
+
+### `docker` alias
+
+```bash
+alias garagectl='/garage/garage \
+  --ca-cert /etc/garage/pki/garage-ca.crt \
+  --client-cert /etc/garage/pki/garage.crt \
+  --client-key /etc/garage/pki/garage.key'
+```
+
+
+### raw binary alias
+
+```bash
+alias garagectl='/usr/local/bin/garage \
+  --ca-cert /etc/garage/pki/garage-ca.crt \
+  --client-cert /etc/garage/pki/garage.crt \
+  --client-key /etc/garage/pki/garage.key'
+```
+
+Of course, if your deployment does not match exactly one of this alias, feel free to adapt it to your needs!
+
+## Test the alias
+
+You can test your alias by running a simple command such as:
+
+```
+garagectl status
+```
+
+You should get something like that as result:
+
+```
+Healthy nodes:
+2a638ed6c775b69a…	37f0ba978d27	[::ffff:172.20.0.101]:3901	UNCONFIGURED/REMOVED
+68143d720f20c89d…	9795a2f7abb5	[::ffff:172.20.0.103]:3901	UNCONFIGURED/REMOVED
+8781c50c410a41b3…	758338dde686	[::ffff:172.20.0.102]:3901	UNCONFIGURED/REMOVED
+```
+
+...which means that you are ready to configure your cluster!

doc/book/src/getting_started/daemon.md

@@ -0,0 +1,222 @@
+# Configure the daemon
+
+Garage is a software that can be run only in a cluster and requires at least 3 instances.
+In our getting started guide, we document two deployment types:
+  - [Test deployment](#test-deployment) though `docker-compose`
+  - [Real-world deployment](#real-world-deployment) through `docker` or `systemd`
+
+In any case, you first need to generate TLS certificates, as traffic is encrypted between Garage's nodes.
+
+## Generating a TLS Certificate
+
+To generate your TLS certificates, run on your machine:
+
+```
+wget https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/branch/master/genkeys.sh
+chmod +x genkeys.sh
+./genkeys.sh
+```
+
+It will creates a folder named `pki` containing the keys that you will used for the cluster.
+
+## Test deployment
+
+Single machine deployment is only described through `docker-compose`.
+
+Before starting, we recommend you create a folder for our deployment:
+
+```bash
+mkdir garage-single
+cd garage-single
+```
+
+We start by creating a file named `docker-compose.yml` describing our network and our containers:
+
+```yml
+version: '3.4'
+
+networks: { virtnet: { ipam: { config: [ subnet: 172.20.0.0/24 ]}}}
+
+services:
+  g1:
+    image: lxpz/garage_amd64:v0.1.1d
+    networks: { virtnet: { ipv4_address: 172.20.0.101 }}
+    volumes:
+      - "./pki:/pki"
+      - "./config.toml:/garage/config.toml"
+
+  g2:
+    image: lxpz/garage_amd64:v0.1.1d
+    networks: { virtnet: { ipv4_address: 172.20.0.102 }}
+    volumes:
+      - "./pki:/pki"
+      - "./config.toml:/garage/config.toml"
+
+  g3:
+    image: lxpz/garage_amd64:v0.1.1d
+    networks: { virtnet: { ipv4_address: 172.20.0.103 }}
+    volumes:
+      - "./pki:/pki"
+      - "./config.toml:/garage/config.toml"
+```
+
+*We define a static network here which is not considered as a best practise on Docker.
+The rational is that Garage only supports IP address and not domain names in its configuration, so we need to know the IP address in advance.*
+
+and then create the `config.toml` file next to it as follow:
+
+```toml
+metadata_dir = "/garage/meta"
+data_dir = "/garage/data"
+rpc_bind_addr = "[::]:3901"
+bootstrap_peers = [
+  "172.20.0.101:3901",
+  "172.20.0.102:3901",
+  "172.20.0.103:3901",
+]
+
+[rpc_tls]
+ca_cert = "/pki/garage-ca.crt"
+node_cert = "/pki/garage.crt"
+node_key = "/pki/garage.key"
+
+[s3_api]
+s3_region = "garage"
+api_bind_addr = "[::]:3900"
+
+[s3_web]
+bind_addr = "[::]:3902"
+root_domain = ".web.garage"
+index = "index.html"
+```
+
+*Please note that we have not mounted `/garage/meta` or `/garage/data` on the host: data will be lost when the container will be destroyed.*
+
+And that's all, you are ready to launch your cluster!
+
+```
+sudo docker-compose up
+```
+
+While your daemons are up, your cluster is still not configured yet.
+However, you can check that your services are still listening as expected by querying them from your host:
+
+```bash
+curl http://172.20.0.{101,102,103}:3902
+```
+
+which should give you:
+
+```
+Not found
+Not found
+Not found
+```
+
+That's all, you are ready to [configure your cluster!](./cluster.md).
+
+## Real-world deployment
+
+Before deploying garage on your infrastructure, you must inventory your machines.
+For our example, we will suppose the following infrastructure:
+
+| Location | Name    | IP Address | Disk Space |
+|----------|---------|------------|------------|
+| Paris    | Mercury | fc00:1::1  | 1 To       |
+| Paris    | Venus   | fc00:1::2  | 2 To       |
+| London   | Earth   | fc00:B::1  | 2 To       |
+| Brussels | Mars    | fc00:F::1  | 1.5 To     |
+
+On each machine, we will have a similar setup, especially you must consider the following folders/files:
+  - `/etc/garage/pki`: Garage certificates, must be generated on your computer and copied on the servers
+  - `/etc/garage/config.toml`: Garage daemon's configuration (defined below)
+  - `/etc/systemd/system/garage.service`: Service file to start garage at boot automatically (defined below, not required if you use docker)
+  - `/var/lib/garage/meta`: Contains Garage's metadata, put this folder on a SSD if possible
+  - `/var/lib/garage/data`: Contains Garage's data, this folder will grows and must be on a large storage, possibly big HDDs.
+
+A valid `/etc/garage/config.toml` for our cluster would be:
+
+```toml
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+rpc_bind_addr = "[::]:3901"
+bootstrap_peers = [
+  "[fc00:1::1]:3901",
+  "[fc00:1::2]:3901",
+  "[fc00:B::1]:3901",
+  "[fc00:F::1]:3901",
+]
+
+[rpc_tls]
+ca_cert = "/etc/garage/pki/garage-ca.crt"
+node_cert = "/etc/garage/pki/garage.crt"
+node_key = "/etc/garage/pki/garage.key"
+
+[s3_api]
+s3_region = "garage"
+api_bind_addr = "[::]:3900"
+
+[s3_web]
+bind_addr = "[::]:3902"
+root_domain = ".web.garage"
+index = "index.html"
+```
+
+Please make sure to change `bootstrap_peers` to **your** IP addresses!
+
+### For docker users
+
+On each machine, you can run the daemon with:
+
+```bash
+docker run \
+  -d \
+  --name garaged \
+  --restart always \
+  --network host \
+  -v /etc/garage/pki:/etc/garage/pki \
+  -v /etc/garage/config.toml:/garage/config.toml \
+  -v /var/lib/garage/meta:/var/lib/garage/meta \
+  -v /var/lib/garage/data:/var/lib/garage/data \
+  lxpz/garage_amd64:v0.1.1d
+```
+
+It should be restart automatically at each reboot.
+Please note that we use host networking as otherwise Docker containers can no communicate with IPv6.
+
+To upgrade, simply stop and remove this container and start again the command with a new version of garage.
+
+### For systemd/raw binary users
+
+Create a file named `/etc/systemd/system/garage.service`:
+
+```toml
+[Unit]
+Description=Garage Data Store
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Environment='RUST_LOG=garage=info' 'RUST_BACKTRACE=1'
+ExecStart=/usr/local/bin/garage server -c /etc/garage/config.toml
+
+[Install]
+WantedBy=multi-user.target
+```
+
+To start the service then automatically enable it at boot:
+
+```bash
+sudo systemctl start garage
+sudo systemctl enable garage
+```
+
+To see if the service is running and to browse its logs:
+
+```bash
+sudo systemctl status garage
+sudo journalctl -u garage
+```
+
+If you want to modify the service file, do not forget to run `systemctl daemon-reload`
+to inform `systemd` of your modifications.

doc/book/src/getting_started/files.md

@@ -0,0 +1,42 @@
+# Handle files
+
+We recommend the use of MinIO Client to interact with Garage files (`mc`).
+Instructions to install it and use it are provided on the [MinIO website](https://docs.min.io/docs/minio-client-quickstart-guide.html).
+Before reading the following, you need a working `mc` command on your path.
+
+## Configure `mc`
+
+You need your access key and secret key created in the [previous section](bucket.md).
+You also need to set the endpoint: it must match the IP address of one of the node of the cluster and the API port (3900 by default).
+For this whole configuration, you must set an alias name: we chose `my-garage`, that you will used for all commands.
+
+Adapt the following command accordingly and run it:
+
+```bash
+mc alias set \
+  my-garage \
+  http://172.20.0.101:3900 \
+  <access key> \
+  <secret key> \
+  --api S3v4
+```
+
+You must also add an environment variable to your configuration to inform MinIO of our region (`garage` by default).
+The best way is to add the following snippet to your `$HOME/.bash_profile` or `$HOME/.bashrc` file:
+
+```bash
+export MC_REGION=garage
+```
+
+## Use `mc`
+
+You can not list buckets from `mc` currently.
+
+But the following commands and many more should work:
+
+```bash
+mc cp image.png my-garage/nextcloud-bucket
+mc cp my-garage/nextcloud-bucket/image.png .
+mc ls my-garage/nextcloud-bucket
+mc mirror localdir/ my-garage/another-bucket
+```

doc/book/src/getting_started/index.md

@@ -0,0 +1,5 @@
+# Getting Started
+
+Let's start your Garage journey!
+In this chapter, we explain how to deploy a simple garage cluster and start interacting with it.
+Our goal is to introduce you to Garage's workflows.

doc/book/src/intro.md

@@ -4,14 +4,6 @@
 	</a>
 </p>
 
-<p align="center" style="text-align:center;">
-	[ <a href="https://garagehq.deuxfleurs.fr/_releases.html">Download</a>
-	| <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage">Git repository</a>
-	| <a href="https://matrix.to/#/%23garage:deuxfleurs.fr">Matrix channel</a>
-	| <a href="https://drone.deuxfleurs.fr/Deuxfleurs/garage">Drone CI</a>
-	]
-</p>
-
 ```
 This very website is hosted using Garage. In other words: the doc is the PoC!
 ```
@@ -71,7 +63,7 @@ We also do not classify Swift as *Simple*.
 **[Ceph](https://ceph.io/ceph-storage/object-storage/):**
 This review holds for the whole Ceph stack, including the RADOS paper, Ceph Object Storage module, the RADOS Gateway, etc.
 At its core, Ceph has been designed to provide *POSIX/Filesystem compatibility* which requires strong consistency, which in turn
-makes Ceph latency-sensitive and fails our *Internet enabled* goal.
+makes Ceph latency-sensitive and fails our *Internet enabled* goal. 
 Due to its industry oriented design, Ceph is also far from being *Simple* to operate and from being *Self-contained & lightweight* which makes it hard to integrate it in an hyperconverged infrastructure.
 In a certain way, Ceph and MinIO are closer together than they are from Garage or OpenStack Swift.
 
@@ -97,9 +89,7 @@ If you encounter a specific bug in Garage or plan to patch it, you may jump dire
 
 We love to talk and hear about Garage, that's why we keep a log here:
 
-  - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2021-04-28_spirals-team/talk.pdf)
-
-  - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2020-12-02_wide-team/talk.pdf)
+  - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/doc/20201202_talk/talk.pdf)
 
 *Did you write or talk about Garage? [Open a pull request](https://git.deuxfleurs.fr/Deuxfleurs/garage/) to add a link here!*
 
@@ -112,18 +102,3 @@ Our code repository and issue tracker, which is the place where you should repor
 
 Garage's source code, is released under the [AGPL v3 License](https://www.gnu.org/licenses/agpl-3.0.en.html).
 Please note that if you patch Garage and then use it to provide any service over a network, you must share your code!
-
-# Funding
-
-The Deuxfleurs association has received a grant promise to fund 3 people working on Garage for a year, from October 2021 to September 2022.
-
-<div style="display: flex; justify-content: space-around">
-  <a href="https://pointer.ngi.eu/">
-    <img style="height:100px" src="img/ngi-logo.png" alt="NGI Pointer logo">
-  </a>
-  <a href="https://ec.europa.eu/programmes/horizon2020/what-horizon-2020">
-    <img style="height:100px" src="img/eu-flag-logo.png" alt="EU flag logo">
-  </a>
-</div>
-
-_This project has received funding from the European Union’s Horizon 2020 research and innovation programme within the framework of the NGI-POINTER Project funded under grant agreement No 871528._

doc/book/src/quick_start/index.md

@@ -1,273 +0,0 @@
-# Quick Start
-
-Let's start your Garage journey!
-In this chapter, we explain how to deploy Garage as a single-node server
-and how to interact with it.
-
-Our goal is to introduce you to Garage's workflows.
-Following this guide is recommended before moving on to
-[configuring a real-world deployment](../cookbook/real_world.md).
-
-Note that this kind of deployment should not be used in production, as it provides
-no redundancy for your data!
-
-## Get a binary
-
-Download the latest Garage binary from the release pages on our repository:
-
-<https://git.deuxfleurs.fr/Deuxfleurs/garage/releases>
-
-Place this binary somewhere in your `$PATH` so that you can invoke the `garage`
-command directly (for instance you can copy the binary in `/usr/local/bin`
-or in `~/.local/bin`).
-
-If a binary of the last version is not available for your architecture,
-you can [build Garage from source](../cookbook/from_source.md).
-
-
-## Writing a first configuration file
-
-This first configuration file should allow you to get started easily with the simplest
-possible Garage deployment.
-**Save it as `/etc/garage.toml`.**
-You can also store it somewhere else, but you will have to specify `-c path/to/garage.toml`
-at each invocation of the `garage` binary (for example: `garage -c ./garage.toml server`, `garage -c ./garage.toml status`).
-
-```toml
-metadata_dir = "/tmp/meta"
-data_dir = "/tmp/data"
-
-replication_mode = "none"
-
-rpc_bind_addr = "[::]:3901"
-rpc_public_addr = "127.0.0.1:3901"
-rpc_secret = "1799bccfd7411eddcf9ebd316bc1f5287ad12a68094e1c6ac6abde7e6feae1ec"
-
-bootstrap_peers = []
-
-[s3_api]
-s3_region = "garage"
-api_bind_addr = "[::]:3900"
-
-[s3_web]
-bind_addr = "[::]:3902"
-root_domain = ".web.garage"
-index = "index.html"
-```
-
-The `rpc_secret` value provided above is just an example. It will work, but in
-order to secure your cluster you will need to use another one. You can generate
-such a value with `openssl rand -hex 32`.
-
-
-As you can see in the `metadata_dir` and `data_dir` parameters, we are saving Garage's data
-in `/tmp` which gets erased when your system reboots. This means that data stored on this
-Garage server will not be persistent. Change these to locations on your local disk if you want
-your data to be persisted properly.
-
-
-## Launching the Garage server
-
-Use the following command to launch the Garage server with our configuration file:
-
-```
-RUST_LOG=garage=info garage server
-```
-
-You can tune Garage's verbosity as follows (from less verbose to more verbose):
-
-```
-RUST_LOG=garage=info garage server
-RUST_LOG=garage=debug garage server
-RUST_LOG=garage=trace garage server
-```
-
-Log level `info` is recommended for most use cases.
-Log level `debug` can help you check why your S3 API calls are not working.
-
-
-## Checking that Garage runs correctly
-
-The `garage` utility is also used as a CLI tool to configure your Garage deployment.
-It uses values from the TOML configuration file to find the Garage daemon running on the
-local node, therefore if your configuration file is not at `/etc/garage.toml` you will
-again have to specify `-c path/to/garage.toml`.
-
-If the `garage` CLI is able to correctly detect the parameters of your local Garage node,
-the following command should be enough to show the status of your cluster:
-
-```
-garage status
-```
-
-This should show something like this:
-
-```
-==== HEALTHY NODES ====
-ID                 Hostname  Address         Tag                   Zone  Capacity
-563e1ac825ee3323…  linuxbox  127.0.0.1:3901  NO ROLE ASSIGNED
-```
-
-## Configuring your Garage node
-
-Configuring the nodes in a Garage deployment means informing Garage
-of the disk space available on each node of the cluster
-as well as the zone (e.g. datacenter) each machine is located in.
-
-For our test deployment, we are using only one node. The way in which we configure
-it does not matter, you can simply write:
-
-```bash
-garage node configure -z dc1 -c 1 <node_id>
-```
-
-where `<node_id>` corresponds to the identifier of the node shown by `garage status` (first column).
-You can enter simply a prefix of that identifier.
-For instance here you could write just `garage node configure -z dc1 -c 1 563e`.
-
-
-
-
-## Creating buckets and keys
-
-In this section, we will suppose that we want to create a bucket named `nextcloud-bucket`
-that will be accessed through a key named `nextcloud-app-key`.
-
-Don't forget that `help` command and `--help` subcommands can help you anywhere,
-the CLI tool is self-documented! Two examples:
-
-```
-garage help
-garage bucket allow --help
-```
-
-#### Create a bucket
-
-Let's take an example where we want to deploy NextCloud using Garage as the
-main data storage.
-
-First, create a bucket with the following command:
-
-```
-garage bucket create nextcloud-bucket
-```
-
-Check that everything went well:
-
-```
-garage bucket list
-garage bucket info nextcloud-bucket
-```
-
-#### Create an API key
-
-The `nextcloud-bucket` bucket now exists on the Garage server,
-however it cannot be accessed until we add an API key with the proper access rights.
-
-Note that API keys are independent of buckets:
-one key can access multiple buckets, multiple keys can access one bucket.
-
-Create an API key using the following command:
-
-```
-garage key new --name nextcloud-app-key
-```
-
-The output should look as follows:
-
-```
-Key name: nextcloud-app-key
-Key ID: GK3515373e4c851ebaad366558
-Secret key: 7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34
-Authorized buckets:
-```
-
-Check that everything works as intended:
-
-```
-garage key list
-garage key info nextcloud-app-key
-```
-
-#### Allow a key to access a bucket
-
-Now that we have a bucket and a key, we need to give permissions to the key on the bucket:
-
-```
-garage bucket allow \
-  --read \
-  --write 
-  nextcloud-bucket \
-  --key nextcloud-app-key
-```
-
-You can check at any time the allowed keys on your bucket with:
-
-```
-garage bucket info nextcloud-bucket
-```
-
-
-## Uploading and downlading from Garage
-
-We recommend the use of MinIO Client to interact with Garage files (`mc`).
-Instructions to install it and use it are provided on the
-[MinIO website](https://docs.min.io/docs/minio-client-quickstart-guide.html).
-Before reading the following, you need a working `mc` command on your path.
-
-Note that on certain Linux distributions such as Arch Linux, the Minio client binary
-is called `mcli` instead of `mc` (to avoid name clashes with the Midnight Commander).
-
-#### Configure `mc`
-
-You need your access key and secret key created above.
-We will assume you are invoking `mc` on the same machine as the Garage server,
-your S3 API endpoint is therefore `http://127.0.0.1:3900`.
-For this whole configuration, you must set an alias name: we chose `my-garage`, that you will used for all commands.
-
-Adapt the following command accordingly and run it:
-
-```bash
-mc alias set \
-  my-garage \
-  http://127.0.0.1:3900 \
-  <access key> \
-  <secret key> \
-  --api S3v4
-```
-
-You must also add an environment variable to your configuration to
-inform MinIO of our region (`garage` by default, corresponding to the `s3_region` parameter
-in the configuration file).
-The best way is to add the following snippet to your `$HOME/.bash_profile`
-or `$HOME/.bashrc` file:
-
-```bash
-export MC_REGION=garage
-```
-
-#### Use `mc`
-
-You can not list buckets from `mc` currently.
-
-But the following commands and many more should work:
-
-```bash
-mc cp image.png my-garage/nextcloud-bucket
-mc cp my-garage/nextcloud-bucket/image.png .
-mc ls my-garage/nextcloud-bucket
-mc mirror localdir/ my-garage/another-bucket
-```
-
-
-#### Other tools for interacting with Garage
-
-The following tools can also be used to send and recieve files from/to Garage:
-
-- the [AWS CLI](https://aws.amazon.com/cli/)
-- [`rclone`](https://rclone.org/)
-- [Cyberduck](https://cyberduck.io/)
-- [`s3cmd`](https://s3tools.org/s3cmd)
-
-Refer to the ["configuring clients"](../cookbook/clients.md) page to learn how to configure
-these clients to interact with a Garage server.

doc/book/src/reference_manual/cli.md

@@ -1,4 +0,0 @@
-# Garage CLI
-
-The Garage CLI is mostly self-documented. Make use of the `help` subcommand
-and the `--help` flag to discover all available options.

doc/book/src/reference_manual/configuration.md

@@ -1,201 +0,0 @@
-# Garage configuration file format reference
-
-Here is an example `garage.toml` configuration file that illustrates all of the possible options:
-
-```toml
-metadata_dir = "/var/lib/garage/meta"
-data_dir = "/var/lib/garage/data"
-
-block_size = 1048576
-
-replication_mode = "3"
-
-rpc_secret = "4425f5c26c5e11581d3223904324dcb5b5d5dfb14e5e7f35e38c595424f5f1e6"
-rpc_bind_addr = "[::]:3901"
-rpc_public_addr = "[fc00:1::1]:3901"
-
-bootstrap_peers = [
-    "563e1ac825ee3323aa441e72c26d1030d6d4414aeb3dd25287c531e7fc2bc95d@[fc00:1::1]:3901",
-    "86f0f26ae4afbd59aaf9cfb059eefac844951efd5b8caeec0d53f4ed6c85f332[fc00:1::2]:3901",
-    "681456ab91350f92242e80a531a3ec9392cb7c974f72640112f90a600d7921a4@[fc00:B::1]:3901",
-    "212fd62eeaca72c122b45a7f4fa0f55e012aa5e24ac384a72a3016413fa724ff@[fc00:F::1]:3901",
-]
-
-consul_host = "consul.service"
-consul_service_name = "garage-daemon"
-
-sled_cache_capacity = 134217728
-sled_flush_every_ms = 2000
-
-[s3_api]
-api_bind_addr = "[::]:3900"
-s3_region = "garage"
-
-[s3_web]
-bind_addr = "[::]:3902"
-root_domain = ".web.garage"
-index = "index.html"
-```
-
-The following gives details about each available configuration option.
-
-## Available configuration options
-
-#### `metadata_dir`
-
-The directory in which Garage will store its metadata. This contains the node identifier,
-the network configuration and the peer list, the list of buckets and keys as well
-as the index of all objects, object version and object blocks.
-
-Store this folder on a fast SSD drive if possible to maximize Garage's performance.
-
-#### `data_dir`
-
-The directory in which Garage will store the data blocks of objects.
-This folder can be placed on an HDD. The space available for `data_dir`
-should be counted to determine a node's capacity
-when [configuring it](../getting_started/05_cluster.md).
-
-#### `block_size`
-
-Garage splits stored objects in consecutive chunks of size `block_size`
-(except the last one which might be smaller). The default size is 1MB and
-should work in most cases.  If you are interested in tuning this, feel free
-to do so (and remember to report your findings to us!). If this value is
-changed for a running Garage installation, only files newly uploaded will be
-affected. Previously uploaded files will remain available. This however
-means that chunks from existing files will not be deduplicated with chunks
-from newly uploaded files, meaning you might use more storage space that is
-optimally possible.
-
-#### `replication_mode`
-
-Garage supports the following replication modes:
-
-- `none` or `1`: data stored on Garage is stored on a single node. There is no redundancy,
-  and data will be unavailable as soon as one node fails or its network is disconnected.
-  Do not use this for anything else than test deployments.
-
-- `2`: data stored on Garage will be stored on two different nodes, if possible in different
-  zones. Garage tolerates one node failure before losing data. Data should be available
-  read-only when one node is down, but write operations will fail.
-  Use this only if you really have to.
-
-- `3`: data stored on Garage will be stored on three different nodes, if possible each in
-  a different zones.
-  Garage tolerates two node failure before losing data. Data should be available
-  read-only when two nodes are down, and writes should be possible if only a single node
-  is down.
-
-Note that in modes `2` and `3`,
-if at least the same number of zones are available, an arbitrary number of failures in 
-any given zone is tolerated as copies of data will be spread over several zones.
-
-**Make sure `replication_mode` is the same in the configuration files of all nodes.
-Never run a Garage cluster where that is not the case.**
-
-Changing the `replication_mode` of a cluster might work (make sure to shut down all nodes
-and changing it everywhere at the time), but is not officially supported.
-
-#### `rpc_secret`
-
-Garage uses a secret key that is shared between all nodes of the cluster
-in order to identify these nodes and allow them to communicate together.
-This key should be specified here in the form of a 32-byte hex-encoded
-random string. Such a string can be generated with a command
-such as `openssl rand -hex 32`.
-
-#### `rpc_bind_addr`
-
-The address and port on which to bind for inter-cluster communcations
-(reffered to as RPC for remote procedure calls).
-The port specified here should be the same one that other nodes will used to contact
-the node, even in the case of a NAT: the NAT should be configured to forward the external
-port number to the same internal port nubmer. This means that if you have several nodes running
-behind a NAT, they should each use a different RPC port number.
-
-#### `rpc_public_addr`
-
-The address and port that other nodes need to use to contact this node for
-RPC calls.  **This parameter is optional but recommended.** In case you have
-a NAT that binds the RPC port to a port that is different on your public IP,
-this field might help making it work.
-
-#### `bootstrap_peers`
-
-A list of peer identifiers on which to contact other Garage peers of this cluster.
-These peer identifiers have the following syntax:
-
-```
-<node public key>@<node public IP or hostname>:<port>
-```
-
-In the case where `rpc_public_addr` is correctly specified in the
-configuration file, the full identifier of a node including IP and port can
-be obtained by running `garage node-id` and then included directly in the
-`bootstrap_peers` list of other nodes.  Otherwise, only the node's public
-key will be returned by `garage node-id` and you will have to add the IP
-yourself.
-
-#### `consul_host` and `consul_service_name`
-
-Garage supports discovering other nodes of the cluster using Consul.
-This works only when nodes are announced in Consul by an orchestrator such as Nomad,
-as Garage is not able to announce itself.
-
-The `consul_host` parameter should be set to the hostname of the Consul server,
-and `consul_service_name` should be set to the service name under which Garage's
-RPC ports are announced.
-
-#### `sled_cache_capacity`
-
-This parameter can be used to tune the capacity of the cache used by
-[sled](https://sled.rs), the database Garage uses internally to store metadata.
-Tune this to fit the RAM you wish to make available to your Garage instance.
-More cache means faster Garage, but the default value (128MB) should be plenty
-for most use cases.
-
-#### `sled_flush_every_ms`
-
-This parameters can be used to tune the flushing interval of sled.
-Increase this if sled is thrashing your SSD, at the risk of losing more data in case
-of a power outage (though this should not matter much as data is replicated on other
-nodes). The default value, 2000ms, should be appropriate for most use cases.
-
-
-## The `[s3_api]` section
-
-#### `api_bind_addr`
-
-The IP and port on which to bind for accepting S3 API calls.
-This endpoint does not suport TLS: a reverse proxy should be used to provide it.
-
-#### `s3_region`
-
-Garage will accept S3 API calls that are targetted to the S3 region defined here.
-API calls targetted to other regions will fail with a AuthorizationHeaderMalformed error
-message that redirects the client to the correct region.
-
-
-## The `[s3_web]` section
-
-Garage allows to publish content of buckets as websites. This section configures the
-behaviour of this module.
-
-#### `bind_addr`
-
-The IP and port on which to bind for accepting HTTP requests to buckets configured
-for website access.
-This endpoint does not suport TLS: a reverse proxy should be used to provide it.
-
-#### `root_domain`
-
-The optionnal suffix appended to bucket names for the corresponding HTTP Host.
-
-For instance, if `root_domain` is `web.garage.eu`, a bucket called `deuxfleurs.fr`
-will be accessible either with hostname `deuxfleurs.fr.web.garage.eu`
-or with hostname `deuxfleurs.fr`.
-
-#### `index`
-
-The name of the index file to return for requests ending with `/` (usually `index.html`).

doc/book/src/reference_manual/s3_compatibility.md

@@ -1,6 +1,6 @@
-# S3 Compatibility status
+## S3 Compatibility status
 
-## Global S3 features
+### Global S3 features
 
 Implemented:
 
@@ -14,44 +14,71 @@ Not implemented:
 
 - vhost-style URLs (`bucket.garage.tld/key`)
 - object-level ACL
-- object versioning
 - encryption
 - most `x-amz-` headers
 
 
-## Endpoint implementation
+### Endpoint implementation
 
 All APIs that are not mentionned are not implemented and will return a 400 bad request.
 
-| Endpoint                     | Status                           |
-|------------------------------|----------------------------------|
-| AbortMultipartUpload         | Implemented                      |
-| CompleteMultipartUpload      | Implemented                      |
-| CopyObject                   | Implemented                      |
-| CreateBucket                 | Unsupported, stub (see below)    |
-| CreateMultipartUpload        | Implemented                      |
-| DeleteBucket                 | Unsupported (see below)          |
-| DeleteObject                 | Implemented                      |
-| DeleteObjects                | Implemented                      |
-| GetBucketLocation            | Implemented                      |
-| GetBucketVersioning          | Stub (see below)                 |
-| GetObject                    | Implemented                      |
-| HeadBucket                   | Implemented                      |
-| HeadObject                   | Implemented                      |
-| ListBuckets                  | Implemented                      |
-| ListObjects                  | Implemented, bugs? (see below)   |
-| ListObjectsV2                | Implemented                      |
-| PutObject                    | Implemented                      |
-| UploadPart                   | Implemented                      |
+#### AbortMultipartUpload
 
+Implemented.
 
+#### CompleteMultipartUpload
 
-- **CreateBucket:** Garage does not yet accept creating buckets or giving access using API calls, it has to be done using the CLI tools. CreateBucket will return a 200 if the bucket exists and user has write access, and a 403 Forbidden in all other cases.
+Implemented badly. Garage will not check that all the parts stored correspond to the list given by the client in the request body. This means that the multipart upload might be completed with an invalid size. This is a bug and will be fixed.
 
-- **DeleteBucket:** Garage does not yet accept deleting buckets using API calls, it has to be done using the CLI tools. This request will return a 403 Forbidden.
+#### CopyObject
 
-- **GetBucketVersioning:** Stub implementation (Garage does not yet support versionning so this always returns
-"versionning not enabled").
+Implemented.
 
-- **ListObjects:** Implemented, but there isn't a very good specification of what `encoding-type=url` covers so there might be some encoding bugs. In our implementation the url-encoded fields are in the same in ListObjects as they are in ListObjectsV2.
+#### CreateBucket
+
+Garage does not accept creating buckets or giving access using API calls, it has to be done using the CLI tools. CreateBucket will return a 200 if the bucket exists and user has write access, and a 403 Forbidden in all other cases.
+
+#### CreateMultipartUpload
+
+Implemented.
+
+#### DeleteBucket
+
+Garage does not accept deleting buckets using API calls, it has to be done using the CLI tools. This request will return a 403 Forbidden.
+
+#### DeleteObject
+
+Implemented.
+
+#### DeleteObjects
+
+Implemented.
+
+#### GetObject
+
+Implemented.
+
+#### HeadBucket
+
+Implemented.
+
+#### HeadObject
+
+Implemented.
+
+#### ListObjects
+
+Implemented, but there isn't a very good specification of what `encoding-type=url` covers so there might be some encoding bugs. In our implementation the url-encoded fields are in the same in ListObjects as they are in ListObjectsV2.
+
+#### ListObjectsV2
+
+Implemented.
+
+#### PutObject
+
+Implemented.
+
+#### UploadPart
+
+Implemented.
 

doc/book/src/working_documents/load_balancing.md

@@ -1,8 +1,8 @@
-# Load Balancing Data (planned for version 0.2)
+## Load Balancing Data (planned for version 0.2)
 
 I have conducted a quick study of different methods to load-balance data over different Garage nodes using consistent hashing.
 
-## Requirements
+### Requirements
 
 - *good balancing*: two nodes that have the same announced capacity should receive close to the same number of items
 
@@ -15,9 +15,9 @@ I have conducted a quick study of different methods to load-balance data over di
   replicas, independently of the order in which nodes were added/removed (this
   is to keep the implementation simple)
 
-## Methods
+### Methods
 
-### Naive multi-DC ring walking strategy
+#### Naive multi-DC ring walking strategy
 
 This strategy can be used with any ring-like algorithm to make it aware of the *multi-datacenter* requirement:
 
@@ -38,7 +38,7 @@ This method was implemented in the first version of Garage, with the basic
 ring construction from Dynamo DB that consists in associating `n_token` random positions to
 each node (I know it's not optimal, the Dynamo paper already studies this).
 
-### Better rings
+#### Better rings
 
 The ring construction that selects `n_token` random positions for each nodes gives a ring of positions that
 is not well-balanced: the space between the tokens varies a lot, and some partitions are thus bigger than others.
@@ -150,7 +150,7 @@ removing grisou gipsie : 49.22% 36.52% 12.79% 1.46%
 on average:  62.94% 27.89% 8.61% 0.57%                  <-- WORSE THAN PREVIOUSLY
 ```
 
-### The magical solution: multi-DC aware MagLev
+#### The magical solution: multi-DC aware MagLev
 
 Suppose we want to select three replicas for each partition (this is what we do in our simulation and in most Garage deployments).
 We apply MagLev three times consecutively, one for each replica selection.

doc/book/src/working_documents/migration_04.md

@@ -1,105 +0,0 @@
-# Migrating from 0.3 to 0.4
-
-**Migrating from 0.3 to 0.4 is unsupported. This document is only intended to
-document the process internally for the Deuxfleurs cluster where we have to do
-it. Do not try it yourself, you will lose your data and we will not help you.**
-
-**Migrating from 0.2 to 0.4 will break everything for sure. Never try it.**
-
-The internal data format of Garage hasn't changed much between 0.3 and 0.4.
-The Sled database is still the same, and the data directory as well.
-
-The following has changed, all in the meta directory:
-
-- `node_id` in 0.3 contains the identifier of the current node. In 0.4, this
-  file does nothing and should be deleted. It is replaced by `node_key` (the
-  secret key) and `node_key.pub` (the associated public key). A node's
-  identifier on the ring is its public key.
-
-- `peer_info` in 0.3 contains the list of peers saved automatically by Garage.
-  The format has changed and it is now stored in `peer_list` (`peer_info`
-  should be deleted).
-
-When migrating, all node identifiers will change. This also means that the
-affectation of data partitions on the ring will change, and lots of data will
-have to be rebalanced.
-
-- If your cluster has only 3 nodes, all nodes store everything, therefore nothing has to be rebalanced.
-
-- If your cluster has only 4 nodes, for any partition there will always be at
-  least 2 nodes that stored data before that still store it after. Therefore
-  the migration should in theory be transparent and Garage should continue to
-  work during the rebalance.
-
-- If your cluster has 5 or more nodes, data will disappear during the
-  migration. Do not migrate (fortunately we don't have this scenario at
-  Deuxfleurs), or if you do, make Garage unavailable until things stabilize
-  (disable web and api access).
-
-
-The migration steps are as follows:
-
-1. Prepare a new configuration file for 0.4. For each node, point to the same
-   meta and data directories as Garage 0.3. Basically, the things that change
-   are the following:
-
-  - No more `rpc_tls` section
-  - You have to generate a shared `rpc_secret` and put it in all config files
-  - `bootstrap_peers` has a different syntax as it has to contain node keys.
-    Leave it empty and use `garage node-id` and `garage node connect` instead (new features of 0.4)
-  - put the publicly accessible RPC address of your node in `rpc_public_addr` if possible (its optional but recommended)
-  - If you are using Consul, change the `consul_service_name` to NOT be the name advertised by Nomad.
-    Now Garage is responsible for advertising its own service itself.
-
-2. Disable api and web access for some time (Garage does not support disabling
-   these endpoints but you can change the port number or stop your reverse
-   proxy for instance).
-
-3. Do `garage repair -a --yes tables` and `garage repair -a --yes blocks`,
-   check the logs and check that all data seems to be synced correctly between
-   nodes.
-
-4. Save somewhere the output of `garage status`. We will need this to remember
-   how to reconfigure nodes in 0.4.
-
-5. Turn off Garage 0.3
-
-6. Backup metadata folders if you can (i.e. if you have space to do it
-   somewhere). Backuping data folders could also be usefull but that's much
-   harder to do. If your filesystem supports snapshots, this could be a good
-   time to use them.
-
-7. Turn on Garage 0.4
-
-8. At this point, running `garage status` should indicate that all nodes of the
-   previous cluster are "unavailable". The nodes have new identifiers that
-   should appear in healthy nodes once they can talk to one another (use
-   `garage node connect` if necessary`). They should have NO ROLE ASSIGNED at
-   the moment.
-
-9. Prepare a script with several `garage node configure` commands that replace
-   each of the v0.3 node ID with the corresponding v0.4 node ID, with the same
-   zone/tag/capacity. For example if your node `drosera` had identifier `c24e`
-   before and now has identifier `789a`, and it was configured with capacity
-   `2` in zone `dc1`, put the following command in your script:
-
-```bash
-garage node configure 789a -z dc1 -c 2 -t drosera --replace c24e
-```
-
-10. Run your reconfiguration script. Check that the new output of `garage
-	status` contains the correct node IDs with the correct values for capacity
-	and zone. Old nodes should no longer be mentioned.
-
-11. If your cluster has 4 nodes or less, and you are feeling adventurous, you
-	can reenable Web and API access now. Things will probably work.
-
-12. Garage might already be resyncing stuff. Issue a `garage repair -a --yes
-	tables` and `garage repair -a --yes blocks` to force it to do so.
-
-13. Wait for resyncing activity to stop in the logs. Do steps 12 and 13 two or
-	three times, until you see that when you issue the repair commands, nothing
-	gets resynced any longer.
-
-14. Your upgraded cluster should be in a working state. Re-enable API and Web
-	access and check that everything went well.

doc/talks/2021-04-28_spirals-team/.gitignore

@@ -1,10 +0,0 @@
-*.bbl
-*.aux
-*.bcf
-*.blg
-*.log
-*.run.xml
-*.synctex.gz
-build/
-main.pdf
-figures/crdt.pdf

doc/talks/2021-04-28_spirals-team/Makefile

@@ -1,33 +0,0 @@
-.PHONY: all viewpdf pdf clean
-
-TARGET       = main
-SOURCE_FILES = $(shell find . -type f -name "*.tex" -print)
-CLASS_FILES  = $(shell find . -type f -name "*.cls" -print)
-BIB_FILES    = $(shell find . -type f -name "*.bib" -print)
-FIGURES      = $(shell find . -path "./figures/*" -type f -print)
-BUILD_PATH   = build
-BUILD_FILES  = $(shell find $(BUILD_PATH) -type f -print)
-
-BIB_PROCESSOR := biber
-
-.PHONY: all pdf clean figures
-
-all: pdf
-
-pdf: $(TARGET).pdf
-
-clean:
-	@rm $(TARGET).pdf $(BUILD_FILES) > /dev/null 2>&1 || exit 0
-
-figures: figures/crdt.pdf
-
-$(TARGET).pdf: figures $(FIGURES) $(SOURCE_FILES) $(BIB_FILES) $(CLASS_FILES)
-	@mkdir -p $(BUILD_PATH) > /dev/null 2>&1 || exit 0
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex
-	@$(BIB_PROCESSOR) --output-directory $(BUILD_PATH) $(TARGET)
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex # For biber
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex # For biber
-	@ln -fs $(BUILD_PATH)/$(TARGET).pdf $(TARGET).pdf
-
-figures/crdt.pdf: figures/svg/crdt.svg
-	@inkscape -C --file=$< --export-pdf=$@

doc/talks/2021-04-28_spirals-team/README.md

@@ -1 +0,0 @@
-Presentation of Garage by Adrien on April, 28th 2021, for his research team [Spirals](https://team.inria.fr/spirals/).

doc/talks/2021-04-28_spirals-team/bibliography.bib

@@ -1,27 +0,0 @@
-
-@inproceedings{brewer_towards_2000,
-  title = {Towards {{Robust Distributed Systems}}},
-  booktitle = {{{ACM PODC}}},
-  author = {Brewer, Eric},
-  year = {2000}
-}
-
-
-
-@incollection{defago_conflict-free_2011,
-  title = {Conflict-{{Free Replicated Data Types}}},
-  booktitle = {Stabilization, {{Safety}}, and {{Security}} of {{Distributed Systems}}},
-  author = {Shapiro, Marc and Pregui{\c c}a, Nuno and Baquero, Carlos and Zawirski, Marek},
-  year = {2011},
-  address = {{Berlin, Heidelberg}},
-}
-
-
-@inproceedings{decandia_dynamo:_2007,
-  title = {Dynamo: {{Amazon}}'s {{Highly Available Key}}-Value {{Store}}},
-  booktitle = {{ACM SOSP}},
-  author = {DeCandia, Giuseppe and Hastorun, Deniz and Jampani, Madan and Kakulapati, Gunavardhan and Lakshman, Avinash and Pilchin, Alex and Sivasubramanian, Swaminathan and Vosshall, Peter and Vogels, Werner},
-  year = {2007},
-  address = {{New York, USA}},
-}
-

doc/talks/2021-04-28_spirals-team/conclusion.tex

@@ -1,7 +0,0 @@
-\section{Conclusion}
-
-\begin{frame}{The future is cooler when we bend it our way}
-
-Contributions welcome! :D
-
-\end{frame}

doc/talks/2021-04-28_spirals-team/escaping_the_cloud.tex

@@ -1,124 +0,0 @@
-\section{Escaping the cloud}
-
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \begin{frame}{Down to Earth with home-hosting}
-
-
-% \todo{Stanley Parabole reference?}
-
-% \end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Why?}
-
-\begin{itemize}
-	\item \textbf{Privacy}: no prying eyes besides your ISP
-	\item \textbf{Control} of your infrastructure
-	\item \textbf{Ecology}: reuse old hardware
-\end{itemize}
-
-\vfill
-\begin{block}{\emph{Tim Berners-Lee} (1994)}
-``Now, if someone tries to monopolize the Web, for example pushes proprietary variations on network protocols, then that would make me unhappy.''
-\end{block}
-
-\begin{itemize}
-	\item Make Tim Berners-Lee happy
-\end{itemize}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{What?}
-
-\centering\Large
-A data store for commodity hardware on heterogenous household connections. 
-
-
-\vfill\raggedright\normalsize
-
-
-\begin{block}{Targetting user-facing services}
-\begin{itemize}
-	\item Static sites 
-	\item E-mails
-	\item Instant communication
-	%\item Video streaming % No need for a data store
-	\item Collaboration 
-\end{itemize}
-\end{block}
-\vfill
-
-Nothing fancy like sensors data streams, AI or IoT.
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{What?}
-
-
-\begin{block}{Requirements}
-\begin{itemize}
-	\item \textbf{No single point of failure} / flat hierarchy: 
-
-	Any node can die for extended periods of time.
-	\item \textbf{Multi-site}: cluster spans regions/countries.
-	\item \textbf{Acceptable performance}.
-	\item \textbf{Lightweight}: targets legacy hardware.
-	\item \textbf{Conceptually simple}: built for low-tech organisations.
-
-	Adding/maintaining cluster nodes should be easy.
-\end{itemize}
-\end{block}
-\vfill 
-
-\begin{block}{Non-goals}
-\begin{itemize}
-	\item \textbf{Super badass performance}.
-	\item \textbf{NAT traversal} etc.: we require full-mesh connectivity.
-\end{itemize}
-\end{block}
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{How?}
-
-\begin{itemize}
-	\item Theoretically possible with object storage \& CRDTs.
-	\vfill
-	\item Household uplinks are getting decent (optical fibers).
-\end{itemize}
-
-
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Research Questions}
-
-\begin{itemize}
-	\item Decent performance despite bad inter-node connectivity.
-	\vfill
-
-	\item Tailoring workloads as a function of nodes' capabilities:
-
-	\begin{itemize}
-		\item Make use of low-end nodes (e.g. Raspberry Pis),
-		\item Avoid impeding global performance because of low-end nodes.
-	\end{itemize}
-	\vfill
-
-	\item Building CRDTs for target use-cases:
-
-	\begin{itemize}
-		\item Software engineering: DSL or native code?
-		\item Provide APIs to data store users? Risky?
-	\end{itemize}
-	\vfill
-
-	\item Cluster management: effortless UX, low perf. overhead.
-\end{itemize}
-\end{frame}

doc/talks/2021-04-28_spirals-team/figures/svg/conflict.svg

@@ -1,930 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="119.30722mm"
-   height="121.49291mm"
-   viewBox="0 0 119.30722 121.49291"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="conflict.svg">
-  <defs
-     id="defs2">
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker2999"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2997"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker2964"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2962"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1467"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1465"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker1449"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend">
-      <path
-         inkscape:connector-curvature="0"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path1447" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker12071"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path12069"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker9668"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path9666"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker6943"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path6941"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker5445"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path5443"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1115"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path861"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path826"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path820"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1101"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1099"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path817"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="244.86596"
-     inkscape:cy="205.06317"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer5"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1055"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Common"
-     transform="translate(-43.663712,-16.067619)"
-     style="display:inline">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 99.856918,34.684511 h 4.913692"
-       id="path1257"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-       d="M 102.31376,23.208557 V 135.9963"
-       id="path815"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="90.524658"
-       y="19.57423"
-       id="text838"><tspan
-         sodipodi:role="line"
-         id="tspan836"
-         x="90.524658"
-         y="19.57423"
-         style="font-weight:bold;stroke-width:0.26458332px"># vaccines</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="46.748138"
-       y="19.57423"
-       id="text13775"><tspan
-         sodipodi:role="line"
-         id="tspan13773"
-         x="46.748138"
-         y="19.57423"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Iwona;-inkscape-font-specification:'Iwona Italic';stroke-width:0.26458332px">Paris</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="148.20457"
-       y="19.57423"
-       id="text13798"><tspan
-         sodipodi:role="line"
-         id="tspan13796"
-         x="148.20457"
-         y="19.57423"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Iwona;-inkscape-font-specification:'Iwona Italic';stroke-width:0.26458332px">Lille</tspan></text>
-  </g>
-  <g
-     inkscape:label="The problem"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:none"
-     transform="translate(-43.663712,-16.067619)">
-    <g
-       id="g13753"
-       transform="translate(0,12.170833)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path850"
-         d="M 97.820644,51.619712 75.828475,64.316897"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1115)" />
-      <text
-         y="-108.69946"
-         x="-183.00148"
-         transform="rotate(180,91.874093,54.229103)"
-         id="text7803"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath7973"
-           xlink:href="#path850"><tspan
-   id="tspan7801"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-         d="M 75.056888,72.78638 97.049057,85.483565"
-         id="path9498"
-         inkscape:connector-curvature="0" />
-      <text
-         transform="translate(9.4212508,3.3408691)"
-         y="2.986012"
-         x="8.5186663"
-         id="text10668"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath10836"
-           xlink:href="#path9498"><tspan
-   id="tspan10666"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <g
-       id="g13763"
-       transform="translate(0,12.170833)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)"
-         d="m 106.80689,51.619712 21.99218,12.697185"
-         id="path11899"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path11901"
-         d="M 129.57066,72.78638 107.57848,85.483565"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text13737"
-         transform="rotate(-115.89278,108.31787,47.643413)"
-         x="-372.04132"
-         y="-217.15767"><textPath
-           xlink:href="#path850"
-           id="textPath13735"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13733">R</tspan></textPath></text>
-      <text
-         transform="rotate(-58.856754,100.88692,38.870944)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text13743"
-         x="46.604572"
-         y="6.6609678"><textPath
-           xlink:href="#path9498"
-           id="textPath13741"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13739">W</tspan></textPath></text>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path13768"
-       d="m 99.856918,112.89149 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="43.564934"
-       y="53.51746"
-       id="text13802"><tspan
-         sodipodi:role="line"
-         id="tspan13800"
-         x="43.564934"
-         y="53.51746"
-         style="stroke-width:0.26458332px">We acquired 1000 doses!</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="49.979401"
-       y="82.649841"
-       id="text13806"><tspan
-         sodipodi:role="line"
-         id="tspan13804"
-         x="49.979401"
-         y="82.649841"
-         style="stroke-width:0.26458332px">x + 1000</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="136.842"
-       y="82.649841"
-       id="text13810"><tspan
-         sodipodi:role="line"
-         id="tspan13808"
-         x="136.842"
-         y="82.649841"
-         style="stroke-width:0.26458332px">x + 500</tspan></text>
-    <text
-       id="text13814"
-       y="53.51746"
-       x="112.88577"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="53.51746"
-         x="112.88577"
-         id="tspan13812"
-         sodipodi:role="line">We acquired 500 doses!</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.70142"
-       y="114.62009"
-       id="text13818"><tspan
-         sodipodi:role="line"
-         id="tspan13816"
-         x="108.70142"
-         y="114.62009"
-         style="font-weight:bold;stroke-width:0.26458332px">???</tspan></text>
-    <text
-       id="text3109"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3107"
-         sodipodi:role="line">T0: 5000</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="ACID"
-     style="display:none">
-    <rect
-       ry="5.2916665"
-       y="67.923912"
-       x="61.174206"
-       height="39.498508"
-       width="54.42857"
-       id="rect14092"
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-    <rect
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke"
-       id="rect14090"
-       width="54.42857"
-       height="39.498508"
-       x="1.6973262"
-       y="21.886396"
-       ry="5.2916665" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path14037"
-       d="m 56.193207,64.654408 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 56.193207,110.69192 h 4.913692"
-       id="path14040"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g14075"
-       transform="translate(0,-1.9988201)">
-      <g
-         id="g13993"
-         transform="translate(-43.663711,-25.06345)"
-         style="display:inline">
-        <path
-           inkscape:connector-curvature="0"
-           id="path13977"
-           d="M 97.820644,51.619712 75.828475,64.316897"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1115)" />
-        <text
-           y="-108.69946"
-           x="-183.00148"
-           transform="rotate(180,91.874093,54.229103)"
-           id="text13983"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><textPath
-             id="textPath13981"
-             xlink:href="#path850"><tspan
-   id="tspan13979"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-           d="M 75.056888,72.78638 97.049057,85.483565"
-           id="path13985"
-           inkscape:connector-curvature="0" />
-        <text
-           transform="translate(9.4212508,3.3408691)"
-           y="2.986012"
-           x="8.5186663"
-           id="text13991"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><textPath
-             id="textPath13989"
-             xlink:href="#path9498"><tspan
-   id="tspan13987"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-      </g>
-      <text
-         id="text14044"
-         y="29.833508"
-         x="3.4844763"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="stroke-width:0.26458332px"
-           y="29.833508"
-           x="3.4844763"
-           id="tspan14042"
-           sodipodi:role="line">AcqDoses(1000)</tspan></text>
-    </g>
-    <g
-       id="g14088"
-       transform="translate(0,-0.41130478)">
-      <g
-         id="g14011"
-         transform="translate(-43.663711,19.386549)"
-         style="display:inline">
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)"
-           d="m 106.80689,51.619712 21.99218,12.697185"
-           id="path13995"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path13997"
-           d="M 129.57066,72.78638 107.57848,85.483565"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text14003"
-           transform="rotate(-115.89278,108.31787,47.643413)"
-           x="-372.04132"
-           y="-217.15767"><textPath
-             xlink:href="#path850"
-             id="textPath14001"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13999">R</tspan></textPath></text>
-        <text
-           transform="rotate(-58.856754,100.88692,38.870944)"
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text14009"
-           x="46.604572"
-           y="6.6609678"><textPath
-             xlink:href="#path9498"
-             id="textPath14007"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan14005">W</tspan></textPath></text>
-      </g>
-      <text
-         id="text14044-8"
-         y="74.283508"
-         x="82.76487"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="stroke-width:0.26458332px"
-           y="74.283508"
-           x="82.76487"
-           id="tspan14042-8"
-           sodipodi:role="line">AcqDoses(500)</tspan></text>
-    </g>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="82.757004"
-       id="text832-6"><tspan
-         sodipodi:role="line"
-         id="tspan830-8"
-         x="108.80019"
-         y="82.757004"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T1: 6000</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="128.8701"
-       id="text832-3"><tspan
-         sodipodi:role="line"
-         id="tspan830-83"
-         x="108.80019"
-         y="128.8701"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T2: 6500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="36.388439"
-       id="text3117"><tspan
-         sodipodi:role="line"
-         id="tspan3115"
-         x="108.80019"
-         y="36.388439"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T0: 5000</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="BASE"
-     style="display:none">
-    <g
-       id="g1463"
-       transform="translate(0,-21.166667)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         id="path1369"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text1375"
-         transform="rotate(180,70.308075,52.117558)"
-         x="-279.42224"
-         y="-209.36409"><textPath
-           xlink:href="#path850"
-           id="textPath1373"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan1371">R</tspan></textPath></text>
-    </g>
-    <g
-       id="g1481"
-       transform="translate(0,-21.166667)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1377"
-         d="M 31.393177,68.889594 53.385346,81.586779"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1467)" />
-      <text
-         transform="translate(-34.395836)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text1383"
-         x="17.939917"
-         y="6.3268809"><textPath
-           xlink:href="#path9498"
-           id="textPath1381"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan1379">W</tspan></textPath></text>
-    </g>
-    <g
-       style="display:inline"
-       transform="translate(-43.663711,-25.063453)"
-       id="g1403">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1387"
-         d="m 106.80689,51.619712 21.99218,12.697185"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-         d="M 129.57066,72.78638 107.57848,85.483565"
-         id="path1389"
-         inkscape:connector-curvature="0" />
-      <text
-         y="-217.15767"
-         x="-372.04132"
-         transform="rotate(-115.89278,108.31787,47.643413)"
-         id="text1395"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath1393"
-           xlink:href="#path850"><tspan
-   id="tspan1391"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-      <text
-         y="6.6609678"
-         x="46.604572"
-         id="text1401"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"
-         transform="rotate(-58.856754,100.88692,38.870944)"><textPath
-           id="textPath1399"
-           xlink:href="#path9498"><tspan
-   id="tspan1397"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path1503"
-       d="m 56.193207,73.650233 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       id="text1507"
-       y="75.354156"
-       x="64.607315"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="75.354156"
-         x="64.607315"
-         id="tspan1505"
-         sodipodi:role="line">T1: [(T0, 6000),(T0, 5500)]</tspan></text>
-    <g
-       id="g1530"
-       transform="translate(0,38.100002)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1522"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)" />
-      <text
-         y="-209.36409"
-         x="-279.42224"
-         transform="rotate(180,70.308075,52.117558)"
-         id="text1528"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath1526"
-           xlink:href="#path850"><tspan
-   id="tspan1524"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="8.5044641"
-       y="109.58665"
-       id="text1534"><tspan
-         sodipodi:role="line"
-         id="tspan1532"
-         x="8.5044641"
-         y="109.58665"
-         style="font-weight:normal;stroke-width:0.26458332px">Now solve this!</tspan><tspan
-         sodipodi:role="line"
-         x="8.5044641"
-         y="115.76025"
-         style="font-weight:normal;stroke-width:0.26458332px"
-         id="tspan3159">And write back!</tspan></text>
-    <text
-       id="text1538"
-       y="44.886383"
-       x="6.3156896"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="44.886383"
-         x="6.3156896"
-         id="tspan1536"
-         sodipodi:role="line">x + 1000</tspan></text>
-    <text
-       id="text1542"
-       y="44.886383"
-       x="93.178284"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="44.886383"
-         x="93.178284"
-         id="tspan1540"
-         sodipodi:role="line">x + 500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       id="text3103"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3101"
-         sodipodi:role="line">T0: (⊥, 5000)</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="CRDT"
-     style="display:inline">
-    <g
-       style="display:inline"
-       transform="translate(0,-21.166667)"
-       id="g2920">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1467)"
-         d="M 31.393177,68.889594 53.385346,81.586779"
-         id="path2912"
-         inkscape:connector-curvature="0" />
-      <text
-         y="6.3268809"
-         x="17.939917"
-         id="text2918"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"
-         transform="translate(-34.395836)"><textPath
-           id="textPath2916"
-           xlink:href="#path9498"><tspan
-   id="tspan2914"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <g
-       id="g3013">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2924"
-         d="M 85.906949,47.722927 63.914769,60.420112"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2999)" />
-      <text
-         transform="rotate(-58.856754,57.228059,65.935492)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text2936"
-         x="7.1585193"
-         y="48.970455"><textPath
-           xlink:href="#path9498"
-           id="textPath2934"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan2932">W</tspan></textPath></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="15.648211"
-       y="44.007793"
-       id="text2976"><tspan
-         sodipodi:role="line"
-         id="tspan2974"
-         x="15.648211"
-         y="44.007793"
-         style="font-weight:normal;stroke-width:0.26458332px">incr(1000)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="82.927979"
-       y="44.007793"
-       id="text2980"><tspan
-         sodipodi:role="line"
-         id="tspan2978"
-         x="82.927979"
-         y="44.007793"
-         style="font-weight:normal;stroke-width:0.26458332px">incr(500)</tspan></text>
-    <path
-       inkscape:connector-curvature="0"
-       id="path2982"
-       d="m 56.193207,72.591896 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       id="text2986"
-       y="74.295815"
-       x="65.136482"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="74.295815"
-         x="65.136482"
-         sodipodi:role="line"
-         id="tspan2995">T1: (5000, </tspan><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="79.777985"
-         x="65.136482"
-         sodipodi:role="line"
-         id="tspan1204">      {(a, 1000), (b, 500)})</tspan></text>
-    <g
-       style="display:inline"
-       transform="translate(0,38.100003)"
-       id="g3042">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         id="path3034"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text3040"
-         transform="rotate(180,70.308075,52.117558)"
-         x="-279.42224"
-         y="-209.36409"><textPath
-           xlink:href="#path850"
-           id="textPath3038"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan3036">R</tspan></textPath></text>
-    </g>
-    <text
-       id="text3051"
-       y="102.21611"
-       x="17.764879"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;stroke-width:0.26458332px"
-         y="102.21611"
-         x="17.764879"
-         id="tspan3049"
-         sodipodi:role="line">6500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       id="text3097"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3095"
-         sodipodi:role="line">T0: (5000, ∅)</tspan></text>
-  </g>
-</svg>

doc/talks/2021-04-28_spirals-team/figures/svg/crdt.svg

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="82.010674mm"
-   height="17.561125mm"
-   viewBox="0 0 82.010674 17.561125"
-   version="1.1"
-   id="svg1579"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="crdt.svg">
-  <defs
-     id="defs1573">
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2645"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mend">
-      <path
-         transform="scale(-0.6)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path2643"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2605"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mstart">
-      <path
-         transform="scale(0.6)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path2603"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path2206"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mstart"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path2203"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(0.6)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2197"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2191"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="148.82928"
-     inkscape:cy="-32.722297"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1055"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-21.438257,-19.857903)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:url(#Arrow2Mend)"
-       d="M 44.979166,28.87314 H 58.822544"
-       id="path2177"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g2153">
-      <rect
-         rx="0"
-         ry="3.8793426"
-         y="19.990194"
-         x="21.570549"
-         height="17.296541"
-         width="23.537758"
-         id="rect2124"
-         style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-      <text
-         id="text2132"
-         y="29.799105"
-         x="29.366098"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-weight:normal;stroke-width:0.26458332px"
-           y="29.799105"
-           x="29.366098"
-           id="tspan2130"
-           sodipodi:role="line">App</tspan></text>
-    </g>
-    <rect
-       rx="0"
-       ry="3.8793426"
-       y="19.990194"
-       x="58.612213"
-       height="17.296541"
-       width="23.537758"
-       id="rect2155"
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-    <text
-       id="text2159"
-       y="30.367077"
-       x="63.842014"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;stroke-width:0.26458332px"
-         y="30.367077"
-         x="63.842014"
-         id="tspan2157"
-         sodipodi:role="line">CRDT</tspan></text>
-    <g
-       id="g4137"
-       transform="translate(-15.875)">
-      <rect
-         rx="0"
-         ry="3.8793426"
-         y="19.990194"
-         x="95.653885"
-         height="17.296541"
-         width="23.537758"
-         id="rect2163"
-         style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-      <text
-         id="text2167"
-         y="30.367077"
-         x="96.969627"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-weight:normal;stroke-width:0.26458332px"
-           y="30.367077"
-           x="96.969627"
-           id="tspan2165"
-           sodipodi:role="line">Datastore</tspan></text>
-    </g>
-  </g>
-</svg>

doc/talks/2021-04-28_spirals-team/garage.tex

@@ -1,147 +0,0 @@
-\section{Introducing Garage}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Brought to you by the Deuxfleurs association}
-
-\begin{block}{\textbf{deuxfleurs.fr} -- a libre hosting association with a vision}
-``Shifting the current structure of the Internet from a world of a few very large service providers, to a world where services are hosted by a variety of smaller organisations.''	
-\end{block}
-
-
-\begin{block}{Our goals}
-\begin{itemize}
-	\item To propose performant \& reliable libre services for the masses
-	\item To host and administer our infrastructure ourselves
-	\item To allow members to contribute storage/compute nodes
-	\item Resilience: for availability \& the sysadmins' sleep 
-	\item Conceptual simplicity to ease onboarding \& demistify hosting
-\end{itemize}
-\end{block}
-
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The lacking state of the practice}
-
-\begin{block}{Object storage fitted our needs}
-\begin{itemize}
-	\item Distributed by design
-	\item Objects are replicated
-	\item Conceptually simple
-\end{itemize}
-\end{block}
-\vfill 
-
-\begin{block}{Existing object stores did not}
-	\begin{itemize}
-		\item Too specific / complex 
-		\item Resource hungry 
-		\item Hidden constraints 
-	\end{itemize}
-\end{block}
-\vfill
-
-We developed Garage, an object store with minimal functionality.
-
-It works, and serves our static sites and media.
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Introducing Garage}
-
-\centering
-\url{garagehq.deuxfleurs.fr}
-
-\url{git.deuxfleurs.fr/Deuxfleurs/garage}
-
-\includegraphics[width=.4\columnwidth]{figures/garage_distributed.png}
-\vfill
-
-\raggedright
-\begin{itemize}
-	\item Distributed data store
-	\item Based on DynamoDB object store (P2P!)
-	\item Modular data types/protocols with CRDTs:
-	\begin{itemize}
-		\item Done: objects (media, static sites, backups...) via S3 API 
-		\item To do: e-mails via IMAP protocol, and more
-	\end{itemize}
-\end{itemize}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[t]{The \textbf{RING}}
-
-\centering
-\fullcite{decandia_dynamo:_2007}
-\vspace{3ex}
-
-\only<1>{\includegraphics[width=.5\columnwidth]{figures/c1.pdf}}%
-\only<2>{\includegraphics[width=.5\columnwidth]{figures/c2.pdf}}%
-\only<3>{\includegraphics[width=.5\columnwidth]{figures/c3.pdf}}%
-\only<4>{\includegraphics[width=.5\columnwidth]{figures/c4.pdf}}%
-\vspace{5ex}
-
-%\raggedright
-\only<1>{Each node is assigned a unique ID on the circular address space.}%
-\only<2-3>{When a new object is added to the store...}%
-\only<3>{\\ It is assigned a unique ID (its \emph{key}) on the address space.}%
-\only<4>{The $R$ nodes after the object are in charge of replicating it.}%
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Distributed metadata}
-
-\centering
-\includegraphics[width=.8\columnwidth]{figures/garage_tables.pdf}
-\vfill
-
-The objects, versions and blocks are all stored in the ring.
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Written in Rust}
-
-\begin{columns}
-\column{.65\columnwidth}
-Entirely written in Rust!
-\column{.35\columnwidth}
-\centering
-\includegraphics[width=.85\columnwidth]{figures/rustacean-flat-happy.png}
-\end{columns}
-\vfill
-
-\begin{columns}
-\column[t]{.6\columnwidth}
-	\textbf{Pros:}
-	\begin{itemize}
-		\item Compiled and fast
-		\item Features prevent usual mistakes:
-
-		strongly typed, immutable by default, ownership instead of GC...
-
-		\item Best of several paradigms:
-
-		imperative, OO, functional
-
-		\item Good libraries for network programmings:
-
-		serialization, http, async/await...
-	\end{itemize}
-\column[t]{.4\columnwidth}
-	\textbf{Cons}:
-	\begin{itemize}
-		\item Steep learning curve
-		\item Long compilation times
-		\item Compiler rage
-	\end{itemize}
-\end{columns}
-
-\end{frame}

doc/talks/2021-04-28_spirals-team/header.tex

@@ -1,134 +0,0 @@
-%% Imports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{graphicx}
-\usepackage[utf8]{inputenc}
-\usepackage{csquotes} % Elegant quotes (must be loaded before babel)
-\usepackage[english]{babel}
-\usepackage[T1]{fontenc}
-% \usepackage{amsfonts}
-% \usepackage{amssymb}
-%\usepackage{lmodern}
-\usepackage{iwona}
-\usepackage{color}
-\usepackage{xspace}
-\usepackage{amsmath}
-\usepackage{hanging}
-\usepackage{listings}
-\lstset{basicstyle=\scriptsize}
-\usepackage{tikz}
-\usepackage{tikzsymbols} % For emojis
-%\usepackage{setspace} % Activation disables footnoes
-\usepackage{perpage} % Reset footnote counter every page
-\MakePerPage{footnote}
-\usepackage{nameref} % For printing the sections' name
-\usepackage{hyperref}
-
-%% Biblio %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=alphabetic,giveninits=true,sorting=none,hyperref,backend=biber,maxnames=3]{biblatex}
-\addbibresource{bibliography.bib}
-
-%% Templating %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{pgf}
-\usepackage{xifthen, tikz}
-
-\usetheme{default} 
-
-\makeatletter
-
-
-%%% colors
-\definecolor{bleuroi}{RGB}{0, 8, 88}
-\definecolor{vertemeraude}{RGB}{0, 64, 44}
-\definecolor{lightgray}{RGB}{245,245,245}
-\definecolor{encre_de_chine}{RGB}{9,36,53}
-\definecolor{im_lost_in_your_eyes}{RGB}{110,138,159}
-\definecolor{metallic_grey}{RGB}{209,219,221}
-\definecolor{metallic_white}{RGB}{229,239,241}
-\definecolor{boss}{RGB}{229,72,27}
-\definecolor{toon_eyes}{RGB}{3,4,6}
-
-\setbeamercolor{frametitle}{bg=bleuroi,fg=white}
-\setbeamercolor*{normal text}{fg=toon_eyes,bg=white} 
-\setbeamercolor*{block title}{fg=white,bg=vertemeraude}
-\setbeamercolor*{block body}{fg=toon_eyes,bg=vertemeraude!5}
-\setbeamercolor{alerted text}{fg=vertemeraude}
-\setbeamercolor*{example text}{fg=toon_eyes,bg=white} 
-\setbeamercolor*{structure}{fg=bleuroi,bg=white}
-% sectionnavigation:
-\setbeamercolor*{section in head/foot}{fg=bleuroi,bg=white}
-
-% \let\oldtextbf\textbf
-% \renewcommand{\textbf}[1]{\textcolor{bleuroi}{\oldtextbf{#1}}}
-
-%%% Rounded boxes with no shading
-\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{%
-  color(0pt)=(upper.bg); color(2pt)=(upper.bg); color(4pt)=(upper.bg)}
-\setbeamertemplate{blocks}[rounded][shadow=false]
-
-%%% Who on Earth uses navigation bars?
-\setbeamertemplate{navigation symbols}{}
-
-
-%%% Headline with sections
-\setbeamertemplate{headline}
-{%
-  \begin{beamercolorbox}[wd=\paperwidth,dp=.5ex,ht=2ex]{section in head/foot}
-    \insertsectionnavigationhorizontal{\paperwidth}{\hskip0pt plus1fill}{\hskip0pt plus1fill}\par % Centered
-    %\insertsectionnavigationhorizontal{\paperwidth}{}{\hfill\hfill} % Left aligned
-  \end{beamercolorbox}%
-}
-% Set the colors of the section bar
-\usesectionheadtemplate
-  {\colorbox{fg}{\color{bg} \insertsectionhead}}
-  {\color{fg!40!bg} \insertsectionhead}
-
-% \newlength\lpg@linewd
-% \setbox0=\hbox{\strut}
-% \newlength\strutht \strutht\ht0
-% \newlength\strutdp \strutdp\dp0
-
-\setbeamertemplate{frametitle}
-{
-  \begin{beamercolorbox}[wd=\paperwidth,dp=1ex,ht=2.6ex,leftskip=.7cm,rightskip=.7cm]{frametitle}
-    %\vskip-1ex
-    %[wd=\lpg@linewd, ht=\strutht, dp=\strutdp]{frametitle}
-    %\vskip-.8ex\hskip0.7cm
-    %\vskip-.8ex
-    \usebeamerfont{frametitle}\strut\insertframetitle
-    \ifx\insertframesubtitle\@empty
-    \else
-    \hfill \usebeamerfont{framesubtitle}\strut\insertframesubtitle
-    \fi%
-  \end{beamercolorbox}
-}
-
-
-%%% Page numbering in footline
-\setbeamertemplate{footline}{
-\hbox{\begin{beamercolorbox}[wd=1\paperwidth,ht=2.5ex,dp=1ex,right]{framenumber in head/foot}%
-    \usebeamerfont{framenumber in head/foot}%
-    %\insertframenumber\space/\space\inserttotalframenumber\hspace{0.3em}
-    \insertframenumber\hspace{0.5em}
-\end{beamercolorbox}}}
-
-%%% Reduce foot citation size
-\renewcommand{\footnotesize}{\tiny}
-
-%%% Display footnotes (not working, still no footnotes)
-% \setbeamertemplate{footnote}{%
-%   \hangpara{2em}{1}%
-%   \makebox[2em][l]{\insertfootnotemark}\footnotesize\insertfootnotetext\par%
-% }
-
-
-\makeatother
-
-%% Commentaires %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\annote}[3]{{
-    \colorbox{#3}{\bfseries\sffamily\footnotesize\textcolor{white}{#2}}
-    \color{#3}
-    $\blacktriangleright$\textit{#1}$\blacktriangleleft$}
-}
-%% Uncomment for final version (removes notes)
-%\renewcommand{\annote}[3]{}
-
-\newcommand{\todo}[1]{\annote{#1}{TODO}{green}}

doc/talks/2021-04-28_spirals-team/introduction.tex

@@ -1,99 +0,0 @@
-\section{Introduction}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{A very casual motivation}
-
-
-\begin{center}
-\Large
-I want to host \textbf{resilient web services} with \textbf{acceptable performance} on commodity hardware behind \textbf{household networks}.
-\end{center}
-\vfill
-
-\begin{block}{Keywords}
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{itemize}
-		\item Decentralised networks
-		\item Edge computing
-	\end{itemize}
-\column{.5\columnwidth}
-	\begin{itemize}
-		\item Distributed storage
-		\item Privacy
-	\end{itemize}
-\end{columns}
-\end{block}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Context}
-
-\textbf{Resilience}: Ability to recover quickly from failures and changes.
-\vspace{1ex}
-
-Only achievable through distribution of the hosted applications across several physical locations.
-\vfill
-
-
-\begin{block}{Application = \textbf{computations} on \textbf{data}}
-\begin{itemize}
-	\item \textbf{Computation}: Stateless; easy to distribute \& orchestrate.
-	% where it is performed does not matter as long as the application's state is accessible R/W
-	%Computation units are "easy" to distribute and orchestrate.
-
-	\item \textbf{Data}: Stateful; hard to distribute \& full of trade-offs.
-\end{itemize}
-\end{block}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Concurrent writes example}{How to lose vaccines}
-
-\centering
-
-\includegraphics[width=.5\columnwidth]{figures/conflict_problem.pdf}
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The problem}
-
-% \textbf{Path dependency}: existing data stores are built for data centres.
-
-% $\implies$ They assume good inter-node connectivity.
-% \vfill
-
-\begin{center}
-\Large
-Can we design an available data store tailored for adverse network conditions?
-\end{center}
-	
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Maybe more framing of the context. What kind of data storage? Object vs Block vs what?
-% \begin{frame}{``Stateless'', ``serverless'', and the elephant in the room}
-
-% It seems easy to deploy \& administer web services nowadays ...
-
-% Because the inherent complexity is shadowed by proprietary ``cloud'' solutions.
-
-% The IT crowd can gloss over ``statelessness'' \emph{ad nauseam} ...
-
-% But storing \emph{state} remains an open research problem.
-
-% Data storage is either:
-
-% \begin{itemize}
-% 	\item A single point of failure;
-% 	\item Delegated to proprietary solutions;
-% 	\item Pain.
-% \end{itemize}
-
-% Today, we will review networked storage's history, and discuss open research questions.
-
-% \end{frame}

doc/talks/2021-04-28_spirals-team/main.tex

@@ -1,70 +0,0 @@
-\documentclass[compress]{beamer}
-
-\input{header.tex}
-
-%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\title{Distributed object storage is centralised}
-\subtitle{A quest for autonomy in the modern hosting ecology}
-\author{Adrien Luxey}
-\date{Wednesday, 28th April, 2021}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Begin document %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{document}
-
-%% Title page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{
-\setbeamertemplate{footline}{} 
-\setbeamertemplate{headline}{} 
-\begin{frame}
-\titlepage
-\end{frame}
-}
-
-%% Contents %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\input{introduction.tex}
-\input{sota.tex}
-\input{escaping_the_cloud.tex}
-\input{garage.tex}
-\input{conclusion.tex}
-
-
-%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% \begin{frame}
-% \large
-% \raggedright
-% Références
-
-% \printbibliography
-% \end{frame}
-
-%% Ending %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{
-\setbeamertemplate{footline}{} 
-\setbeamertemplate{headline}{} 
-\begin{frame}
-\centering
-
-\vspace{1cm}
-\Large Thank you for your attention.
-
-\vspace{2cm}
-\large Now let's chat!
-
-\vspace{1cm}
-\raggedleft
-\includegraphics[width=.2\textwidth]{figures/m_proxy_gray.pdf}
-\end{frame}
-}
-
-%% Appendices %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% \appendix
-% \input{sprinkler_appendix.tex}
-% \input{cascade_appendix.tex}
-% \input{spores_appendix.tex}
-
-
-\end{document}

doc/talks/2021-04-28_spirals-team/sota.tex

@@ -1,323 +0,0 @@
-\section{State of the art}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The CAP theorem}{Consistency vs. Availability}
-
-\begin{block}{Eric Brewer's theorem}
-``A shared-state system can have \textbf{at most two} of the following properties at any given time:
-
-\begin{itemize}
-	\item \textbf{C}onsistency
-	\item \textbf{A}vailability
-	\item \textbf{P}artition tolerance''
-\end{itemize}
-\end{block}
-
-
-\begin{center}
-\Large 
-Under network partitions, a distributed data store has to sacrifice either availability or consistency.
-\end{center}
-\vfill
-
-\begin{itemize}
-	\item \textbf{Consistency-first}: Abort incoming queries;
-	\item \textbf{Availability-first}: Return possibly stale data.
-\end{itemize}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Consistency-first: the ACID model}{Consistency vs. Availability}
-
-\textbf{Transaction}: unit of work within an ACID data store. 
-%Comprises multiple operations.
-%E.g. bank transfer.
-%E.g. a bank transfer from A to B is a transaction involving two operations: withdraw money from A & credit B with the same money amount. 
-\vfill
-
-\begin{itemize}
-	\item \textbf{\underline{A}tomicity}: Transactions either complete entirely or fail.
-
-	No transaction ever seen as in-progress.
-
-	\item \textbf{\underline{C}onsistency}: Transactions always generate a valid state.
-
-	The database maintains its invariants across transactions.
-
-	\item \textbf{\underline{I}solation}: Concurrent transactions are seen as sequential.
-
-	Transactions are serializable, or sequentially consistent.
-
-	\item \textbf{\underline{D}urability}: Committed transactions are never forgotten.
-\end{itemize}
-\vfill\centering
-
-Reads are fast, writes are slow.
-
-\vfill\raggedright
-
-Example: relational databases.
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[fragile]{Concurrent writes in ACID}{Consistency vs. Availability}
-
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{}
-		\begin{lstlisting}
-transaction AcqDoses(y):
-  x <- SELECT #vaccines;
-  UPDATE #vaccines = (x + y);
-		\end{lstlisting}
-	\end{block}
-	\vspace{5ex}
-
-	Supports compound operations.
-\column{.5\columnwidth}
-\centering
-\includegraphics[width=\columnwidth]{figures/conflict_acid.pdf}
-\end{columns}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Availability-first: the BASE model}{Consistency vs. Availability}
-
-
-Some apps prefer availability, e.g. Amazon products' reviews.
-\vfill 
-
-The BASE model trades Consistency \& Isolation for Availability.
-
-
-%Some applications do not care about strong consistency and prefer being highly available (e.g. Amazon's product reviews).
-
-%In order to achieve higher availability, the BASE model relaxes consistency constraints of the ACID model: "eventual consistency".
-\vfill
-
-\begin{itemize}
-	\item \textbf{\underline{B}asic \underline{A}vailability}: 
-	The data store thrives to be available.
-
-	\item \textbf{\underline{S}oft-state}: 
-	Replicas can disagree on the valid state.
-
-	\item \textbf{\underline{E}ventual consistency}: 
-	In the absence of write queries, 
-	the data store will eventually converge to a single valid state.
-\end{itemize}
-\vfill\centering
-
-Writes are fast, reads are slow.
-
-\vfill\raggedright
-
-Examples: key-value \& object stores.
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Concurrent writes in BASE}{Consistency vs. Availability}
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{Object}
-		\begin{itemize}
-			\item Unique key
-			\item Arbitrary value 
-			\item Metadata
-		\end{itemize}
-	\end{block}
-	\vspace{5ex} 
-
-	Conflict resolution = client's job!
-	\vspace{5ex}
-
-	No compound operations.
-\column{.5\columnwidth}
-	\centering
-	\includegraphics[width=\columnwidth]{figures/conflict_base.pdf}
-\end{columns}
-
-% KV storage is another example, distinction is minor here
-
-% Object = unique key, arbitrary value, metadata.
-
-% Object storage only provides semantics to investigate causal order of queries *for individual objects*. No compound operations, no transactions.
-
-% Much easier to distribute, and "scale-out".
-
-% Write is fast, read is slow (gotta collect all object versions).
-
-% \todo{vaccines example with BASE model}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Strong Eventual Consistency w/ CRDTs}{Consistency vs. Availability}
-
-\centering\small
-
-\fullcite{defago_conflict-free_2011}
-
-\vfill\raggedright\normalsize
-
-\begin{block}{Strong Eventual Consistency (SEC)}
-	\begin{itemize}
-		\item CRDTs specify distributed operations
-		\item Conflicts will be solved according to specification
-		\item Proven \& bound eventual convergence
-	\end{itemize}
-\end{block}
-
-\vfill\centering
-\includegraphics[width=.5\columnwidth]{figures/crdt.pdf}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[fragile]{Concurrent writes with CRDTs}{Consistency vs. Availability}
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{}
-		\begin{lstlisting}
-CRDT Counter(x0):
-  history = {}
-  op. incr(y):
-    history U= {(UUID(), y)}
-  op. decr(y):
-    history U= {(UUID(), -y)}
-  op. read():
-    x = x0
-    for (_, y) in history:
-    	x += y
-    return x
-		\end{lstlisting}
-	\end{block}
-	\vspace{2ex}
-
-	Operations commute?
-
-	$\implies$ screw total order!
-\column{.5\columnwidth}
-	\centering
-	\includegraphics[width=\columnwidth]{figures/conflict_crdt.pdf}
-\end{columns}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{A complex CRDT: the DAG}{Consistency vs. Availability}
-
-\centering
-\only<1>{\includegraphics[height=\textheight]{figures/dag_crdt.png}}%
-\only<2>{
-	Just to say I swept a lot under the rug.
-	\vfill
-
-	For details, go read:
-
-	\fullcite{defago_conflict-free_2011}
-	\vfill
-
-	For an implementation, check \textbf{AntidoteDB}.
-}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{State of the practice}{Path dependency to the ``cloud''}
-
-\begin{block}{The BASE model is fashionable because}
-\centering 
-
-``\emph{High-performance} object storage for \emph{AI analytics} with PBs of \emph{IoT data streams} at the \emph{edge}, using \emph{5G}.''
-	% \begin{itemize}
-	% 	\item Highest performance 
-	% 	\item IoT data streams are inherently distributed
-	% \end{itemize}
-\end{block}
-
-\vfill\centering
-
-\includegraphics[width=.9\columnwidth]{figures/minio_edge.png}
-
-\vfill\raggedright
-
-
-%\begin{block}{}
-\begin{itemize}
-	\item Always backed by cloud: high performance network links.
-	\item Edge nodes always seen as clients or data sources, not peers.
-\end{itemize}
-%\end{block}
-
-% There is \textbf{always a central cloud cluster} in these use-cases.
-
-% Hidden constraint: \textbf{high performance inter-node connectivity}.
-
-
-
-\end{frame}
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \begin{frame}{A brief history of storage}
-
-% We keep it short because we'll follow chronological order in the next section too.
-
-% \end{frame}
-
-
-% \begin{frame}{In the beginning, there were \emph{monoliths}}
-
-% \includegraphics[width=.5\columnwidth]{figures/stonehenge.jpg}
-
-% Web applications used to be monolithic:
-
-% \begin{itemize}
-% 	\item One or two servers;
-% 	\item Availability was not an obsession;
-% 	\item Latency was acceptable.
-% \end{itemize}
-
-% Relational databases were queens.
-
-% \end{frame}
-
-
-% \begin{frame}{Then came \emph{expectations}}
-% Then, the whole world went online, and suddenly: expectations!
-
-% \begin{itemize}
-% 	\item ``Milliseconds matter.'' (Algolia slogan)
-% 	\item Critical networked services (healthcare, logistics) need 100\% availability 
-% \end{itemize}
-
-% $\implies$ Microservices \& horizontal scalability.
-
-% \todo{Develop on the `herd not sheep' paradigm a bit.}
-
-% \end{frame}
-
-
-% \begin{frame}{Distributing state/storage: the remaining unknown}
-
-% The microservices orchestration game works well for \emph{stateless} services.
-
-% However, any application requires \emph{state}, persistent data. 
-
-% And this is tough. As we will now see.
-
-% (Not that it's not well studied: distributed storage has always been fashionable.)
-	
-% \end{frame}

doc/talks/2021-09-13-ngi-kickoff/.gitignore

@@ -1,12 +0,0 @@
-*
-
-!img
-
-!.gitignore
-!*.svg
-!*.png
-!*.jpg
-!*.tex
-!Makefile
-!.gitignore
-!talk.pdf

doc/talks/2021-09-13-ngi-kickoff/Makefile

@@ -1,3 +0,0 @@
-talk.pdf: talk.tex
-	pdflatex talk.tex
-

doc/talks/2021-09-13-ngi-kickoff/talk.tex

@@ -1,147 +0,0 @@
-%\nonstopmode
-\documentclass[aspectratio=169]{beamer}
-\usepackage[utf8]{inputenc}
-% \usepackage[frenchb]{babel}
-\usepackage{amsmath}
-\usepackage{mathtools}
-\usepackage{breqn}
-\usepackage{multirow}
-\usetheme{boxes}
-\usepackage{graphicx}
-%\useoutertheme[footline=authortitle,subsection=false]{miniframes}
-
-\beamertemplatenavigationsymbolsempty
-
-\usepackage{tabu}
-\usepackage{multicol}
-\usepackage{vwcol}
-\usepackage{stmaryrd}
-\usepackage{graphicx}
-
-\usepackage[normalem]{ulem}
-
-\title{Presentation of the Garage project}
-\subtitle{NGI pointer kickoff meeting}
-\author{Deuxfleurs Association}
-\date{2021-09-13}
-
-\begin{document}
-
-\begin{frame}
-	\centering
-	\includegraphics[width=.3\linewidth]{../../sticker/Garage.pdf}
-	\vspace{1em}
-
-	{\large\bf Deuxfleurs Association}
-	\vspace{1em}
-
-	\url{https://deuxfleurs.fr/}
-
-	\url{https://garagehq.deuxfleurs.fr/}
-
-	Matrix channel: \texttt{\#garage:deuxfleurs.fr}
-\end{frame}
-
-\begin{frame}
-	\frametitle{Our objective at Deuxfleurs}
-	
-	\begin{center}
-		\textbf{Promote self-hosting and small-scale hosting\\
-			as an alternative to large cloud providers}
-	\end{center}
-	\vspace{2em}
-	\visible<2->{
-		Why is it hard?
-	}
-	\visible<3->{
-		\vspace{2em}
-		\begin{center}
-			\textbf{\underline{Resilience}}\\
-			{\footnotesize (we want good uptime/availability with low supervision)}
-		\end{center}
-	}
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to be resilient (the hard way)}
-
-	Entreprise-grade systems typically employ:
-	\vspace{1em}
-	\begin{itemize}
-		\item Redundant Internet connections
-		\item Redundant electricity
-		\item UPSes
-		\item RAID
-		\item ... 
-	\end{itemize}
-	\vspace{1em}
-	$\to$ it's costly and only worth it at DC scale
-\end{frame}
-
-\begin{frame}
-	\frametitle{How to be resilient (the \underline{\textbf{cheap}} way)}
-
-	Instead, we use:
-	\vspace{1em}
-	\begin{itemize}
-		\item Commodity hardware (e.g. old desktop PCs)
-			\vspace{.5em}
-		\item<2-> Commodity Internet (e.g. FTTB, FTTH) and electricity
-			\vspace{.5em}
-		\item<3-> \textbf{Geographical redundancy} (multi-site replication)
-			\vspace{.5em}
-		\item<4-> \textbf{Fault-tolerant distributed algorithms}
-	\end{itemize}
-	\vspace{1em}
-	\visible<5->{
-		\centering
-		\underline{\textbf{This is how we build Garage.}}
-	}
-\end{frame}
-
-\begin{frame}
-	\frametitle{But what is Garage, exactly?}
-	\textbf{Garage is a self-hosted drop-in replacement for the Amazon S3 object store}\\
-	\vspace{.5em}
-	that implements resilience through geographical redundancy on commodity hardware
-
-	\vspace{1em}
-	\visible<2->{
-		\begin{center}
-				Current status: technical preview\\
-				Our goal: release a stable v1.0
-		\end{center}
-	}
-
-	\vspace{1em}
-	\visible<3->{
-		\textbf{Comming up next: an e-mail IMAP inbox based on the same principles}
-	}
-
-	\vspace{1em}
-	\visible<4->{
-		\begin{center}
-				Current status: just an idea\\
-				Our goal: at least a PoC, maybe more
-		\end{center}
-	}
-\end{frame}
-
-\begin{frame}
-	\centering
-	\includegraphics[width=.3\linewidth]{../../sticker/Garage.pdf}
-	\vspace{1em}
-
-	{\large\bf Deuxfleurs Association}
-	\vspace{1em}
-
-	\url{https://deuxfleurs.fr/}
-
-	\url{https://garagehq.deuxfleurs.fr/}
-
-	Matrix channel: \texttt{\#garage:deuxfleurs.fr}
-\end{frame}
-
-\end{document}
-
-%% vim: set ts=4 sw=4 tw=0 noet spelllang=fr :

genkeys.sh

@@ -11,7 +11,7 @@ cd pki
 # the RPC protocol will use to authenticate the other side.
 if [ ! -f garage-ca.key ]; then
     echo "Generating Garage CA keys..."
-	openssl genpkey -algorithm ED25519 -out garage-ca.key
+	openssl genrsa -out garage-ca.key 4096
 	openssl req -x509 -new -nodes -key garage-ca.key -sha256 -days 3650 -out garage-ca.crt -subj "/C=FR/O=Garage"
 fi
 
@@ -22,7 +22,7 @@ fi
 if [ ! -f garage.crt ]; then
 	echo "Generating Garage agent keys..."
 	if [ ! -f garage.key ]; then
-		openssl genpkey -algorithm ED25519 -out garage.key
+		openssl genrsa -out garage.key 4096
 	fi
 	openssl req -new -sha256 -key garage.key -subj "/C=FR/O=Garage/CN=garage" \
 		-out garage.csr
@@ -56,7 +56,7 @@ fi
 if [ ! -f garage-client.crt ]; then
 	echo "Generating Garage client keys..."
 	if [ ! -f garage-client.key ]; then
-		openssl genpkey -algorithm ED25519 -out garage-client.key
+		openssl genrsa -out garage-client.key 4096
 	fi
 	openssl req -new -sha256 -key garage-client.key -subj "/C=FR/O=Garage" \
 		-out garage-client.csr

nix/build_index.nix

@@ -1,146 +0,0 @@
-{
-  path ? "/../aws-list.txt",
-}:
-
-with import ./common.nix;
-let 
-  pkgs = import pkgsSrc {};
-  lib = pkgs.lib;
-
-  /* Converts a key list and a value list to a set
-
-     Example:
-       listToSet [ "name" "version" ] [ "latex" "3.14" ]
-       => { name = "latex"; version = "3.14"; }
-  */
-  listToSet = keys: values: 
-    builtins.listToAttrs 
-      (lib.zipListsWith 
-        (a: b: { name = a; value = b; }) 
-        keys
-        values);
-
-  /* Says if datetime a is more recent than datetime b
-
-    Example:
-      cmpDate { date = "2021-09-10"; time = "22:12:15"; } { date = "2021-02-03"; time = "23:54:12"; }
-      => true
-  */
-  cmpDate = a: b: 
-    let da = (builtins.head a.builds).date;
-        db = (builtins.head b.builds).date;
-    in 
-      if da == db then  (builtins.head a.builds).time > (builtins.head b.builds).time
-      else da > db;
-
-  /* Pretty platforms */
-  prettyPlatform = name:
-    if name == "aarch64-unknown-linux-musl" then "linux/arm64"
-    else if name == "armv6l-unknown-linux-musleabihf" then "linux/arm"
-    else if name == "x86_64-unknown-linux-musl" then "linux/amd64"
-    else if name == "i686-unknown-linux-musl" then "linux/386"
-    else name;
-
-  /* Parsing */
-  list = builtins.readFile (./. + path);
-  entries = lib.splitString "\n" list;
-
-  elems = builtins.filter 
-    (e: (builtins.length e) == 4) 
-    (map 
-      (x: builtins.filter (e: e != "") (lib.splitString " " x)) 
-      entries);
-
-  keys = ["date" "time" "size" "path"];
-  parsed = map (entry: listToSet keys entry) elems;
-
-  subkeys = ["root" "version" "platform" "binary" ];
-  builds = map (entry: entry // listToSet subkeys (lib.splitString "/" entry.path)) parsed;
-
-  /* Aggregation */
-  builds_per_version = lib.foldl (acc: v: acc // { ${v.version} = if builtins.hasAttr v.version acc then acc.${v.version} ++ [ v ] else [ v ]; }) {} builds; 
-
-  versions = builtins.attrNames builds_per_version;
-  versions_release = builtins.filter (x: builtins.match "v[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?" x != null) versions;
-  versions_commit = builtins.filter (x: builtins.match "[0-9a-f]{40}" x != null) versions;
-  versions_extra = lib.subtractLists (versions_release ++ versions_commit) versions;
-
-  sorted_builds = [
-    {
-      name = "Release";
-      hide = false;
-      type = "tag";
-      description = "Release builds are the official builds, they are tailored for productions and are the most tested.";
-      builds =  builtins.sort (a: b: a.version > b.version) (map (x: { version = x; builds = builtins.getAttr x builds_per_version; }) versions_release);
-    }
-    {
-      name = "Extra";
-      hide = true;
-      type = "tag";
-      description = "Extra builds are built on demand to test a specific feature or a specific need.";
-      builds = builtins.sort cmpDate (map (x: { version = x; builds = builtins.getAttr x builds_per_version; }) versions_extra);
-    }
-    {
-      name = "Development";
-      hide = true;
-      type = "commit";
-      description = "Development builds are built periodically. Use them if you want to test a specific feature that is not yet released.";
-      builds = builtins.sort cmpDate (map (x: { version = x; builds = builtins.getAttr x builds_per_version; }) versions_commit);
-    }
-  ];
-
-in
-  pkgs.writeText "index.html" ''
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Garage releases</title>
-    <style>
-      html, body { margin:0; padding: 0 }
-      body { font-family: 'Helvetica', Sans; }
-      section { margin: 1rem; }
-      ul { padding:0; margin: 0.2rem }
-      li {
-        border-radius: 0.2rem;
-        display: inline; 
-        border: 2px #0b5d83 solid; 
-        padding: 0.5rem; 
-        line-height: 3rem;
-        color: #0b5d83;
-      }
-      li:hover { background-color: #0b5d83; color: #fff; }
-      li a, li a:hover { color: inherit; text-decoration: none }
-    </style>
-  </head>
-  <body>
-   ${ builtins.toString (lib.forEach sorted_builds (r: ''
-    <section>
-      <h2>${r.name} builds</h2>
-
-      <p>${r.description}</p>
-
-      ${if r.hide then "<details><summary>Show ${r.name} builds</summary>" else ""}
-      ${ builtins.toString (lib.forEach r.builds (x: ''
-        <h3> ${x.version} (${(builtins.head x.builds).date}) </h3>
-        <p>See this build on</p>
-        <p> Binaries:
-        <ul>
-        ${ builtins.toString (lib.forEach x.builds (b: ''
-          <li><a href="/${b.path}">${prettyPlatform b.platform}</a></li>
-        ''))}
-        </ul></p>
-        <p> Sources:
-        <ul>
-         <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/${r.type}/${x.version}">gitea</a></li>
-         <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${x.version}.zip">.zip</a></li>
-         <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${x.version}.tar.gz">.tar.gz</a></li>
-        </ul></p>
-      ''))  }
-      ${ if builtins.length r.builds == 0 then "<em>There is no build for this category</em>" else "" }
-      ${if r.hide then "</details>" else ""}
-    </section>
-  ''))}
-  </body>
-</html>
-''

nix/common.nix

@@ -1,27 +0,0 @@
-rec {
-  /*
-   * Fixed dependencies
-   */
-  pkgsSrc = fetchTarball {
-    # As of 2021-10-04
-    url ="https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
-    sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
-  };
-  cargo2nixSrc = fetchGit {
-    # As of 2021-10-06
-    url = "https://github.com/superboum/cargo2nix";
-    rev = "1364752cd784764db2ef5b1e1248727cebfae2ce";
-  };
-  rustOverlaySrc = fetchGit {
-    # As of 2021-10-05
-    url = "https://github.com/oxalica/rust-overlay";
-    rev = "9c2fc6a62ccbc6f420d71ecac6bf0b84dbbee64f";
-  };
-
-  /*
-   * Shared objects
-   */
-  rustOverlay = import rustOverlaySrc;
-  cargo2nix = import cargo2nixSrc;
-  cargo2nixOverlay = import "${cargo2nixSrc}/overlay";
-}

nix/kaniko.nix

@@ -1,23 +0,0 @@
-pkgs:
-pkgs.buildGoModule rec {
-  pname = "kaniko";
-  version = "1.6.0";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "GoogleContainerTools";
-    repo = "kaniko";
-    rev = "v${version}";
-    sha256 = "1fnclr556avxay6pvgw5ya3xbxfnf2gv4njq2hr4fd6fcjyslq5h";
-  };
-
-  vendorSha256 = null;
-
-  checkPhase = "true";
-
-  meta = with pkgs.lib; {
-    description = "kaniko is a tool to build container images from a Dockerfile, inside a container or Kubernetes cluster.";
-    homepage = "https://github.com/GoogleContainerTools/kaniko";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-  };
-}

nix/nix.conf

@@ -1,7 +0,0 @@
-substituters = https://cache.nixos.org https://nix.web.deuxfleurs.fr
-trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix.web.deuxfleurs.fr:eTGL6kvaQn6cDR/F9lDYUIP9nCVR/kkshYfLDJf1yKs=
-max-jobs = auto
-cores = 4
-
-# required for containers
-sandbox = false

script/builder_image/Dockerfile

@@ -0,0 +1,6 @@
+FROM rust:buster
+RUN apt-get update && \
+	apt-get install --yes libsodium-dev awscli python-pip && \
+	    rm -rf /var/lib/apt/lists/*
+RUN rustup component add rustfmt
+RUN pip install s3cmd

script/builder_image/Makefile

@@ -0,0 +1,8 @@
+DOCKER=lxpz/garage_builder_amd64
+
+docker:
+	docker build -t $(DOCKER):$(TAG) .
+	docker push $(DOCKER):$(TAG)
+	docker tag $(DOCKER):$(TAG) $(DOCKER):latest
+	docker push $(DOCKER):latest
+	

script/dev-bucket.sh

@@ -6,14 +6,13 @@ SCRIPT_FOLDER="`dirname \"$0\"`"
 REPO_FOLDER="${SCRIPT_FOLDER}/../"
 GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
-NIX_RELEASE="${REPO_FOLDER}/result/bin/"
-PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
+PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 
-garage -c /tmp/config.1.toml bucket create eprouvette
-KEY_INFO=$(garage -c /tmp/config.1.toml key new --name opérateur)
+garage bucket create eprouvette
+KEY_INFO=`garage 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 -c /tmp/config.1.toml bucket allow eprouvette --read --write --key $ACCESS_KEY
+garage 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."

script/dev-clean.sh

@@ -3,6 +3,5 @@
 set -ex
 
 killall -9 garage || echo "garage is not running"
-killall -9 socat || echo "socat is not running"
 rm -rf /tmp/garage*
 rm -rf /tmp/config.*.toml

script/dev-cluster.sh

@@ -6,8 +6,7 @@ SCRIPT_FOLDER="`dirname \"$0\"`"
 REPO_FOLDER="${SCRIPT_FOLDER}/../"
 GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
-NIX_RELEASE="${REPO_FOLDER}/result/bin/"
-PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
+PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m")
 
 export RUST_BACKTRACE=1 
@@ -17,10 +16,6 @@ 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"
@@ -30,10 +25,18 @@ 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
-rpc_public_addr = "127.0.0.1:$((3900+$count))"
-bootstrap_peers = []
-replication_mode = "3"
-rpc_secret = "$NETWORK_SECRET"
+bootstrap_peers = [
+  "127.0.0.1:3901",
+  "127.0.0.1:3902",
+  "127.0.0.1:3903"
+]
+max_concurrent_rpc_requests = 12
+data_replication_factor = 3
+meta_replication_factor = 3
+meta_epidemic_fanout = 3
+
+enable_compression = true
+compressin_level = 10
 
 [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.
@@ -47,45 +50,13 @@ EOF
 
 echo -en "$LABEL configuration written to $CONF_PATH\n"
 
-if [ -z "$SKIP_HTTPS" ]; then
-  echo -en "$LABEL Starting dummy HTTPS reverse proxy\n"
-  mkdir -p /tmp/garagessl
-  openssl req \
-    -new \
-    -x509 \
-    -keyout /tmp/garagessl/test.key \
-    -out /tmp/garagessl/test.crt \
-    -nodes  \
-    -subj "/C=XX/ST=XX/L=XX/O=XX/OU=XX/CN=localhost/emailAddress=X@X.XX" \
-    -addext "subjectAltName = DNS:localhost, IP:127.0.0.1"
-  cat /tmp/garagessl/test.key /tmp/garagessl/test.crt > /tmp/garagessl/test.pem
-  socat openssl-listen:4443,reuseaddr,fork,cert=/tmp/garagessl/test.pem,verify=0 tcp4-connect:localhost:3911 &
-fi
-
-(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
+(garage server -c /tmp/config.$count.toml 2>&1|while read r; do echo -en "$LABEL $r\n"; done) &
 done
 
-RETRY=120
-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"
-    exit 1
-  fi
+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

script/dev-configure.sh

@@ -6,25 +6,18 @@ SCRIPT_FOLDER="`dirname \"$0\"`"
 REPO_FOLDER="${SCRIPT_FOLDER}/../"
 GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
-NIX_RELEASE="${REPO_FOLDER}/result/bin/"
-PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
+PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 
 sleep 5
-RETRY=120
-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."
-    exit 1
-  fi
+until garage status 2>&1|grep -q Healthy ; do 
 	echo "cluster starting..."
 	sleep 1
 done
 
-garage -c /tmp/config.1.toml status \
-	| grep 'NO ROLE' \
+garage status \
+	| grep UNCONFIGURED \
 	| grep -Po '^[0-9a-f]+' \
 	| while read id; do 
-	  garage -c /tmp/config.1.toml node configure -z dc1 -c 1 $id
+	  garage node configure -d dc1 -c 1 $id
 	done
 

script/dev-env-aws.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
+SCRIPT_FOLDER="`dirname \"${BASH_SOURCE[0]}\"`"
+REPO_FOLDER="${SCRIPT_FOLDER}/../"
+GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
+GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
+PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
+
 export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
 export AWS_DEFAULT_REGION='garage'
 
-function aws { command aws --endpoint-url http://127.0.0.1:3911 $@ ; }
-
-aws --version
+alias awsgrg="aws s3 \
+  --endpoint-url http://127.0.0.1:3911"

script/dev-env-duck.sh

@@ -1,52 +0,0 @@
-mkdir -p /tmp/garage.cyberduck.home/.duck/profiles
-
-DUCK_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1`
-DUCK_SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-
-cat > /tmp/garage.cyberduck.home/.duck/credentials <<EOF
-https\://$DUCK_ACCESS_KEY@127.0.0.1\:4443=$DUCK_SECRET_KEY
-EOF
-
-cat > /tmp/garage.cyberduck.home/.duck/profiles/garage.cyberduckprofile <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Protocol</key>
-        <string>s3</string>
-        <key>Vendor</key>
-        <string>garage</string>
-        <key>Scheme</key>
-        <string>https</string>
-        <key>Description</key>
-        <string>GarageS3</string>
-        <key>Default Hostname</key>
-        <string>127.0.0.1</string>
-        <key>Default Port</key>
-        <string>4443</string>
-        <key>Hostname Configurable</key>
-        <false/>
-        <key>Port Configurable</key>
-        <false/>
-        <key>Username Configurable</key>
-        <true/>
-        <key>Username Placeholder</key>
-        <string>Access Key ID (GK...)</string>
-        <key>Password Placeholder</key>
-        <string>Secret Key</string>
-        <key>Properties</key>
-        <array>
-            <string>s3service.disable-dns-buckets=true</string>
-        </array>
-        <key>Region</key>
-        <string>garage</string>
-        <key>Regions</key>
-        <array>
-            <string>garage</string>
-        </array>
-    </dict>
-</plist>
-EOF
-
-function duck { HOME=/tmp/garage.cyberduck.home/ command duck --username $DUCK_ACCESS_KEY $@ ; }
-