.gitignore

@@ -1,4 +1,4 @@
 *-bin
-*admin.yml*
-*bootstrap.yml*
+*-admin.tgz*
+*-bootstrap.tgz
 result

docs/admin/adding-a-host-to-the-network.md

@@ -43,7 +43,7 @@ To create a `bootstrap.yml` file for the new host, the admin should perform the
 following command from their own host:
 
 ```
-cryptic-net hosts create-bootstrap \
+cryptic-net hosts make-bootstrap \
     --hostname <name> \
     --ip <ip> \
     --admin-path <path to admin.yml> \
@@ -61,12 +61,12 @@ running their host's `cryptic-net daemon`.
 ### Encrypted `admin.yml`
 
 If `admin.yml` is kept in an encrypted format on disk (it should be!) then the
-decrypted form can be piped into `create-bootstrap` over stdin. For example, if
+decrypted form can be piped into `make-bootstrap` over stdin. For example, if
 GPG is being used to secure `admin.yml` then the following could be used to
 generate a `bootstrap.yml`:
 
 ```
-gpg -d <path to admin.yml.gpg> | cryptic-net hosts create-bootstrap \
+gpg -d <path to admin.yml.gpg> | cryptic-net hosts make-boostrap \
     --hostname <name> \
     --ip <ip> \
     --admin-path - \

entrypoint/src/bootstrap/garage.go

@@ -11,6 +11,10 @@ func (b Bootstrap) GaragePeers() []garage.RemotePeer {
 
 	for _, host := range b.Hosts {
 
+		if host.Garage == nil {
+			continue
+		}
+
 		for _, instance := range host.Garage.Instances {
 
 			peer := garage.RemotePeer{
@@ -45,7 +49,7 @@ func (b Bootstrap) ChooseGaragePeer() garage.RemotePeer {
 
 	thisHost := b.ThisHost()
 
-	if len(thisHost.Garage.Instances) > 0 {
+	if thisHost.Garage != nil && len(thisHost.Garage.Instances) > 0 {
 
 		inst := thisHost.Garage.Instances[0]
 		return garage.RemotePeer{

entrypoint/src/bootstrap/hosts.go

@@ -58,9 +58,9 @@ type GarageHost struct {
 // Host consolidates all information about a single host from the bootstrap
 // file.
 type Host struct {
-	Name   string     `yaml:"name"`
-	Nebula NebulaHost `yaml:"nebula"`
-	Garage GarageHost `yaml:"garage,omitempty"`
+	Name   string      `yaml:"name"`
+	Nebula NebulaHost  `yaml:"nebula"`
+	Garage *GarageHost `yaml:"garage,omitempty"`
 }
 
 // IP returns the IP address encoded in the Host's nebula certificate, or panics

entrypoint/src/cmd/entrypoint/admin.go

@@ -245,8 +245,8 @@ var subCmdAdminCreateNetwork = subCmd{
 	},
 }
 
-var subCmdAdminCreateBootstrap = subCmd{
-	name:      "create-bootstrap",
+var subCmdAdminMakeBootstrap = subCmd{
+	name:      "make-bootstrap",
 	descr:     "Creates a new bootstrap.yml file for a particular host and writes it to stdout",
 	checkLock: true,
 	do: func(subCmdCtx subCmdCtx) error {
@@ -335,7 +335,7 @@ var subCmdAdmin = subCmd{
 	do: func(subCmdCtx subCmdCtx) error {
 		return subCmdCtx.doSubCmd(
 			subCmdAdminCreateNetwork,
-			subCmdAdminCreateBootstrap,
+			subCmdAdminMakeBootstrap,
 		)
 	},
 }

entrypoint/src/cmd/entrypoint/daemon_util.go

@@ -26,6 +26,8 @@ func mergeDaemonConfigIntoBootstrap(
 
 	if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
 
+		host.Garage = new(bootstrap.GarageHost)
+
 		for _, alloc := range allocs {
 
 			id, err := garage.InitAlloc(alloc.MetaPath)

entrypoint/src/cmd/entrypoint/hosts.go

@@ -38,24 +38,8 @@ var subCmdHostsList = subCmd{
 			return fmt.Errorf("retrieving hosts from garage: %w", err)
 		}
 
-		type host struct {
-			Name   string `yaml:"name"`
-			Nebula struct {
-				IP string `yaml:"ip"`
-			} `yaml:"nebula"`
-			Garage bootstrap.GarageHost `yaml:"garage,omitempty"`
-		}
-
-		hosts := make([]host, 0, len(hostsMap))
-		for _, h := range hostsMap {
-
-			host := host{
-				Name:   h.Name,
-				Garage: h.Garage,
-			}
-
-			host.Nebula.IP = h.IP().String()
-
+		hosts := make([]bootstrap.Host, 0, len(hostsMap))
+		for _, host := range hostsMap {
 			hosts = append(hosts, host)
 		}