Compare commits

..

No commits in common. "6480f6c843bb4854a4880d756f36b732a1681024" and "b7fb1d9c0a489dc628d3c5bd2cb77d0b2fed6133" have entirely different histories.

6 changed files with 27 additions and 27 deletions

View File

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

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

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

View File

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

View File

@ -29,6 +29,10 @@ var (
envAppDirPath = getAppDirPath() envAppDirPath = getAppDirPath()
envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "isle") envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "isle")
envDataDirPath = filepath.Join(xdg.DataHome, "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 { func binPath(name string) string {

View File

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