Compare commits
3 Commits
b7fb1d9c0a
...
6480f6c843
Author | SHA1 | Date | |
---|---|---|---|
|
6480f6c843 | ||
|
fafd711b1b | ||
|
9fa32749b9 |
@ -39,4 +39,3 @@ 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 |
@ -1,11 +1,17 @@
|
|||||||
{
|
{
|
||||||
|
|
||||||
pkgs ? (import ../nix/pkgs.nix).pkgs,
|
buildSystem ? builtins.currentSystem,
|
||||||
|
hostSystem ? buildSystem,
|
||||||
|
pkgsNix ? (import ../nix/pkgs.nix),
|
||||||
|
|
||||||
}: pkgs.mkShell {
|
}: let
|
||||||
|
pkgs = pkgsNix.default {
|
||||||
|
inherit buildSystem hostSystem;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
pkgs.mkShell {
|
||||||
name = "isle-build-docs";
|
name = "isle-build-docs";
|
||||||
buildInputs = [ pkgs.plantuml ];
|
buildInputs = [ pkgs.plantuml ];
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
set -e
|
set -e
|
||||||
plantuml -tsvg ./dev/*.plantuml
|
plantuml -tsvg ./dev/*.plantuml
|
||||||
|
@ -280,7 +280,6 @@ 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:
|
||||||
|
@ -29,10 +29,6 @@ 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 {
|
||||||
|
@ -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"
|
GlobalBucket = "global-shared"
|
||||||
|
|
||||||
// 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.
|
||||||
|
Loading…
Reference in New Issue
Block a user