docs/dev/daemon-process-tree.plantuml

@@ -39,3 +39,4 @@ state AppDir {
 }
 
 @enduml
+

docs/shell.nix

@@ -1,20 +1,14 @@
 {
 
-  buildSystem ? builtins.currentSystem,
-  hostSystem ? buildSystem,
-  pkgsNix ? (import ../nix/pkgs.nix),
+  pkgs ? (import ../nix/pkgs.nix).pkgs,
 
-}: let
-  pkgs = pkgsNix.default {
-    inherit buildSystem hostSystem;
-  };
-in
-  pkgs.mkShell {
-    name = "isle-build-docs";
-    buildInputs = [ pkgs.plantuml ];
-    shellHook = ''
-      set -e
-      plantuml -tsvg ./dev/*.plantuml
-      exit 0
-    '';
-  }
+}: pkgs.mkShell {
+  name = "isle-build-docs";
+  buildInputs = [ pkgs.plantuml ];
+
+  shellHook = ''
+    set -e
+    plantuml -tsvg ./dev/*.plantuml
+    exit 0
+  '';
+}

entrypoint/src/cmd/entrypoint/daemon.go

@@ -280,6 +280,7 @@ var subCmdDaemon = subCmd{
 		case tryLoadBootstrap(bootstrapDataDirPath):
 		case *bootstrapPath != "" && tryLoadBootstrap(*bootstrapPath):
 		case tryLoadBootstrap(bootstrapAppDirPath):
+		case tryLoadBootstrap(bootstrap.DataDirPath(legacyEnvDataDirPath)):
 		case err != nil:
 			return fmt.Errorf("attempting to load bootstrap.yml file: %w", err)
 		default:

entrypoint/src/cmd/entrypoint/main.go

@@ -29,6 +29,10 @@ var (
 	envAppDirPath     = getAppDirPath()
 	envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "isle")
 	envDataDirPath    = filepath.Join(xdg.DataHome, "isle")
+
+	// Deprecated: envDataDirPath used to be this value, before renaming from
+	// cryptic-net
+	legacyEnvDataDirPath = filepath.Join(xdg.DataHome, "cryptic-net")
 )
 
 func binPath(name string) string {

entrypoint/src/garage/garage.go

@@ -19,7 +19,7 @@ const (
 
 	// GlobalBucket is the name of the global garage bucket which is
 	// accessible to all hosts in the network.
-	GlobalBucket = "global-shared"
+	GlobalBucket = "_global"
 
 	// ReplicationFactor indicates the replication factor set on the garage
 	// cluster. We currently only support a factor of 3.