micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Complete in-code changes required by rename

Browse Source
This commit is contained in:
Brian Picciano 2023-08-07 22:12:51 +02:00
parent 3d7651208f
commit b7fb1d9c0a
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/creating-a-new-network.md
View File

@ -86,7 +86,7 @@ be chosen with care.
## Step 3: Prepare to Encrypt `admin.yml` ## Step 3: Prepare to Encrypt `admin.yml`
The `admin.yml` file (which will be created in the next step) is the most The `admin.yml` file (which will be created in the next step) is the most
sensitive part of a isle network. If it falls into the wrong hands it can be sensitive part of an isle network. If it falls into the wrong hands it can be
used to completely compromise your network, impersonate hosts on the network, used to completely compromise your network, impersonate hosts on the network,
and will likely lead to someone stealing or deleting all of your data. and will likely lead to someone stealing or deleting all of your data.

2
docs/dev/design-principles.md
View File

@ -5,7 +5,7 @@ Isle project.
* The UX is aggressively optimized to eliminate manual intervention by users. * The UX is aggressively optimized to eliminate manual intervention by users.
All other concerns are secondary. The concept of "UX" extends beyond GUI All other concerns are secondary. The concept of "UX" extends beyond GUI
interfaces, and encompasses all interactions of any sort with a isle interfaces, and encompasses all interactions of any sort with an isle
process. process.
* All resources within an isle network are expected to be hosted on hardware * All resources within an isle network are expected to be hosted on hardware

2
entrypoint/default.nix
View File

@ -4,7 +4,7 @@
}: buildGoModule { }: buildGoModule {
pname = "cryptic-net-entrypoint"; pname = "isle-entrypoint";
version = "unstable"; version = "unstable";
src = ./src; src = ./src;
vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk="; vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";

1
entrypoint/src/cmd/entrypoint/daemon.go
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:

4
entrypoint/src/cmd/entrypoint/garage.go
View File

@ -17,12 +17,12 @@ var subCmdGarageMC = subCmd{
keyID := flags.StringP( keyID := flags.StringP(
"key-id", "i", "", "key-id", "i", "",
"Optional key ID to use, defaults to that of the shared cryptic-net-global key", "Optional key ID to use, defaults to that of the shared global key",
) )
keySecret := flags.StringP( keySecret := flags.StringP(
"key-secret", "s", "", "key-secret", "s", "",
"Optional key secret to use, defaults to that of the shared cryptic-net-global key", "Optional key secret to use, defaults to that of the shared global key",
) )
if err := flags.Parse(subCmdCtx.args); err != nil { if err := flags.Parse(subCmdCtx.args); err != nil {

8
entrypoint/src/cmd/entrypoint/main.go
View File

@ -27,8 +27,12 @@ func getAppDirPath() string {
var ( var (
envAppDirPath = getAppDirPath() envAppDirPath = getAppDirPath()
envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "cryptic-net") envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "isle")
envDataDirPath = filepath.Join(xdg.DataHome, "cryptic-net") 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 {

4
entrypoint/src/garage/garage.go
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 = "cryptic-net-global" 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.
@ -35,7 +35,7 @@ func nodeKeyPubPath(metaDirPath string) string {
} }
func nodeRPCPortPath(metaDirPath string) string { func nodeRPCPortPath(metaDirPath string) string {
return filepath.Join(metaDirPath, "cryptic-net", "rpc_port") return filepath.Join(metaDirPath, "isle", "rpc_port")
} }
// loadAllocID returns the peer ID (ie the public key) of the node at the given // loadAllocID returns the peer ID (ie the public key) of the node at the given