Compare commits

...

3 Commits

Author SHA1 Message Date
Brian Picciano
6480f6c843 Fix global shared bucket name to conform to S3 naming standards 2023-08-13 16:14:59 +02:00
Brian Picciano
fafd711b1b Fix doc generation, remove cryptic references from plantuml 2023-08-13 15:51:06 +02:00
Brian Picciano
9fa32749b9 Remove old cryptic references completely, fuck it 2023-08-13 15:43:33 +02:00
6 changed files with 27 additions and 27 deletions

View File

@ -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

View File

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

View File

@ -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:

View File

@ -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 {

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" 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.