Support configuring more than one network

AppDir/etc/daemon.yml

@@ -1,4 +1,3 @@
-
 #
 # This file defines all configuration directives which can be modified for
 # the isle daemon at runtime. All values specified here are the
@@ -6,17 +5,23 @@
 #
 ################################################################################
 
+# Configuration broken down by network. Each network can be identified by its
+# ID, its name, or its domain.
+#networks:
+
+  #id-or-name-or-domain:
+
     # A DNS service runs as part of every isle process.
-dns:
+    #dns:
 
       # list of IPs that the DNS service will use to resolve requests outside the
       # network's domain.
-  resolvers:
+      #resolvers:
-    - 1.1.1.1
+      #  - 1.1.1.1
-    - 8.8.8.8
+      #  - 8.8.8.8
 
     # A VPN service runs as part of every isle process.
-vpn:
+    #vpn:
 
       # Enable this field if the vpn will be made to be publicly accessible at a
       # particular IP or hostname. At least one host must have a publicly accessible
@@ -25,38 +30,28 @@ vpn:
 
       # Firewall directives, as described here:
       # https://github.com/slackhq/nebula/blob/v1.6.1/examples/config.yml#L260
-  firewall:
+      #firewall:
-
-    conntrack:
-      tcp_timeout: 12m
-      udp_timeout: 3m
-      default_timeout: 10m
-      max_connections: 100000
-
-    outbound:
 
         # Allow all outbound traffic from this node.
-      - port: any
+        #outbound:
-        proto: any
+        #  - port: any
-        host: any
+        #    proto: any
-
+        #    host: any
-    inbound:
-
-      # If any storage allocations are declared below, the ports used will be
-      # allowed here automatically.
 
         # Allow ICMP between hosts.
-      - port: any
+        #inbound:
-        proto: icmp
+        #  - port: any
-        host: any
+        #    proto: icmp
+        #    host: any
+        #
+        #  # If any storage allocations are declared below, the ports used will be
+        #  # allowed here automatically.
 
-      # That's it.
+      #tun:
-
-  tun:
         # Name of the tun network device which will route VPN traffic.
-    device: isle-tun
+        #device: isle-tun
 
-storage:
+    #storage:
 
       # Allocations defined here are used to store data in the distributed storage
       # network. If no allocations are defined then no data is replicated to this

go/cmd/entrypoint/daemon.go

@@ -56,7 +56,7 @@ var subCmdDaemon = subCmd{
 		// required linux capabilities are set.
 		// TODO check that the tun module is loaded (for nebula).
 
-		daemonConfig, err := daecommon.LoadConfig(envAppDirPath, *daemonConfigPath)
+		daemonConfig, err := daecommon.LoadConfig(*daemonConfigPath)
 		if err != nil {
 			return fmt.Errorf("loading daemon config: %w", err)
 		}

go/daemon/children/children.go

@@ -49,7 +49,7 @@ func (o *Opts) withDefaults() *Opts {
 // - garage (0 or more, depending on configured storage allocations)
 type Children struct {
 	logger        *mlog.Logger
-	daemonConfig daecommon.Config
+	networkConfig daecommon.NetworkConfig
 	runtimeDir    toolkit.Dir
 	opts          Opts
 
@@ -63,7 +63,7 @@ func New(
 	logger *mlog.Logger,
 	binDirPath string,
 	secretsStore secrets.Store,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	runtimeDir toolkit.Dir,
 	garageAdminToken string,
 	hostBootstrap bootstrap.Bootstrap,
@@ -81,7 +81,7 @@ func New(
 
 	c := &Children{
 		logger:        logger,
-		daemonConfig: daemonConfig,
+		networkConfig: networkConfig,
 		runtimeDir:    runtimeDir,
 		opts:          *opts,
 	}
@@ -90,7 +90,7 @@ func New(
 		ctx,
 		garageRPCSecret,
 		binDirPath,
-		daemonConfig,
+		networkConfig,
 		garageAdminToken,
 		hostBootstrap,
 	)
@@ -101,7 +101,7 @@ func New(
 	c.pmux = pmuxlib.NewPmux(pmuxConfig, c.opts.Stdout, c.opts.Stderr)
 
 	initErr := c.postPmuxInit(
-		ctx, daemonConfig, garageAdminToken, hostBootstrap,
+		ctx, networkConfig, garageAdminToken, hostBootstrap,
 	)
 	if initErr != nil {
 		logger.Warn(ctx, "failed to initialize Children, shutting down child processes", err)
@@ -118,7 +118,7 @@ func New(
 // successfully.
 func (c *Children) RestartDNSMasq(hostBootstrap bootstrap.Bootstrap) error {
 	_, err := dnsmasqWriteConfig(
-		c.runtimeDir.Path, c.daemonConfig, hostBootstrap,
+		c.runtimeDir.Path, c.networkConfig, hostBootstrap,
 	)
 	if err != nil {
 		return fmt.Errorf("writing new dnsmasq config: %w", err)
@@ -134,7 +134,7 @@ func (c *Children) RestartDNSMasq(hostBootstrap bootstrap.Bootstrap) error {
 // successfully.
 func (c *Children) RestartNebula(hostBootstrap bootstrap.Bootstrap) error {
 	_, err := nebulaWriteConfig(
-		c.runtimeDir.Path, c.daemonConfig, hostBootstrap,
+		c.runtimeDir.Path, c.networkConfig, hostBootstrap,
 	)
 	if err != nil {
 		return fmt.Errorf("writing a new nebula config: %w", err)

go/daemon/children/diff.go

@@ -18,14 +18,14 @@ type ReloadDiff struct {
 // CalculateReloadDiff calculates a ReloadDiff based on an old and new
 // bootstrap.
 func CalculateReloadDiff(
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	prevBootstrap, nextBootstrap bootstrap.Bootstrap,
 ) (
 	diff ReloadDiff, err error,
 ) {
 	{
-		prevNebulaConfig, prevErr := nebulaConfig(daemonConfig, prevBootstrap)
+		prevNebulaConfig, prevErr := nebulaConfig(networkConfig, prevBootstrap)
-		nextNebulaConfig, nextErr := nebulaConfig(daemonConfig, nextBootstrap)
+		nextNebulaConfig, nextErr := nebulaConfig(networkConfig, nextBootstrap)
 		if err = errors.Join(prevErr, nextErr); err != nil {
 			err = fmt.Errorf("calculating nebula config: %w", err)
 			return
@@ -38,8 +38,8 @@ func CalculateReloadDiff(
 
 	{
 		diff.DNSChanged = !reflect.DeepEqual(
-			dnsmasqConfig(daemonConfig, prevBootstrap),
+			dnsmasqConfig(networkConfig, prevBootstrap),
-			dnsmasqConfig(daemonConfig, nextBootstrap),
+			dnsmasqConfig(networkConfig, nextBootstrap),
 		)
 	}
 

go/daemon/children/dnsmasq.go

@@ -14,7 +14,7 @@ import (
 )
 
 func dnsmasqConfig(
-	daemonConfig daecommon.Config, hostBootstrap bootstrap.Bootstrap,
+	networkConfig daecommon.NetworkConfig, hostBootstrap bootstrap.Bootstrap,
 ) dnsmasq.ConfData {
 	hostsSlice := make([]dnsmasq.ConfDataHost, 0, len(hostBootstrap.Hosts))
 	for _, host := range hostBootstrap.Hosts {
@@ -29,7 +29,7 @@ func dnsmasqConfig(
 	})
 
 	return dnsmasq.ConfData{
-		Resolvers: daemonConfig.DNS.Resolvers,
+		Resolvers: networkConfig.DNS.Resolvers,
 		Domain:    hostBootstrap.NetworkCreationParams.Domain,
 		IP:        hostBootstrap.ThisHost().IP().String(),
 		Hosts:     hostsSlice,
@@ -38,14 +38,14 @@ func dnsmasqConfig(
 
 func dnsmasqWriteConfig(
 	runtimeDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	string, error,
 ) {
 	var (
 		confPath = filepath.Join(runtimeDirPath, "dnsmasq.conf")
-		confData = dnsmasqConfig(daemonConfig, hostBootstrap)
+		confData = dnsmasqConfig(networkConfig, hostBootstrap)
 	)
 
 	if err := dnsmasq.WriteConfFile(confPath, confData); err != nil {
@@ -58,13 +58,13 @@ func dnsmasqWriteConfig(
 func dnsmasqPmuxProcConfig(
 	logger *mlog.Logger,
 	runtimeDirPath, binDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	pmuxlib.ProcessConfig, error,
 ) {
 	confPath, err := dnsmasqWriteConfig(
-		runtimeDirPath, daemonConfig, hostBootstrap,
+		runtimeDirPath, networkConfig, hostBootstrap,
 	)
 	if err != nil {
 		return pmuxlib.ProcessConfig{}, fmt.Errorf(

go/daemon/children/garage.go

@@ -23,12 +23,12 @@ func garageAdminClientLogger(logger *mlog.Logger) *mlog.Logger {
 func waitForGarage(
 	ctx context.Context,
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
 
-	allocs := daemonConfig.Storage.Allocations
+	allocs := networkConfig.Storage.Allocations
 
 	// if this host doesn't have any allocations specified then fall back to
 	// waiting for nebula
@@ -108,7 +108,7 @@ func garagePmuxProcConfigs(
 	ctx context.Context,
 	logger *mlog.Logger,
 	rpcSecret, runtimeDirPath, binDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
@@ -116,7 +116,7 @@ func garagePmuxProcConfigs(
 ) {
 	var (
 		pmuxProcConfigs = map[string]pmuxlib.ProcessConfig{}
-		allocs          = daemonConfig.Storage.Allocations
+		allocs          = networkConfig.Storage.Allocations
 	)
 
 	if len(allocs) > 0 && rpcSecret == "" {

go/daemon/children/nebula.go

@@ -48,7 +48,7 @@ func waitForNebula(
 }
 
 func nebulaConfig(
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	map[string]any, error,
@@ -95,12 +95,12 @@ func nebulaConfig(
 			"respond": true,
 		},
 		"tun": map[string]any{
-			"dev": daemonConfig.VPN.Tun.Device,
+			"dev": networkConfig.VPN.Tun.Device,
 		},
-		"firewall": daemonConfig.VPN.Firewall,
+		"firewall": networkConfig.VPN.Firewall,
 	}
 
-	if publicAddr := daemonConfig.VPN.PublicAddr; publicAddr == "" {
+	if publicAddr := networkConfig.VPN.PublicAddr; publicAddr == "" {
 
 		config["listen"] = map[string]string{
 			"host": "0.0.0.0",
@@ -137,12 +137,12 @@ func nebulaConfig(
 
 func nebulaWriteConfig(
 	runtimeDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	string, error,
 ) {
-	config, err := nebulaConfig(daemonConfig, hostBootstrap)
+	config, err := nebulaConfig(networkConfig, hostBootstrap)
 	if err != nil {
 		return "", fmt.Errorf("creating nebula config: %w", err)
 	}
@@ -158,12 +158,12 @@ func nebulaWriteConfig(
 
 func nebulaPmuxProcConfig(
 	runtimeDirPath, binDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	pmuxlib.ProcessConfig, error,
 ) {
-	config, err := nebulaConfig(daemonConfig, hostBootstrap)
+	config, err := nebulaConfig(networkConfig, hostBootstrap)
 	if err != nil {
 		return pmuxlib.ProcessConfig{}, fmt.Errorf(
 			"creating nebula config: %w", err,

go/daemon/children/pmux.go

@@ -12,7 +12,7 @@ import (
 func (c *Children) newPmuxConfig(
 	ctx context.Context,
 	garageRPCSecret, binDirPath string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	garageAdminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
@@ -21,7 +21,7 @@ func (c *Children) newPmuxConfig(
 	nebulaPmuxProcConfig, err := nebulaPmuxProcConfig(
 		c.runtimeDir.Path,
 		binDirPath,
-		daemonConfig,
+		networkConfig,
 		hostBootstrap,
 	)
 	if err != nil {
@@ -32,7 +32,7 @@ func (c *Children) newPmuxConfig(
 		c.logger,
 		c.runtimeDir.Path,
 		binDirPath,
-		daemonConfig,
+		networkConfig,
 		hostBootstrap,
 	)
 	if err != nil {
@@ -47,7 +47,7 @@ func (c *Children) newPmuxConfig(
 		garageRPCSecret,
 		c.runtimeDir.Path,
 		binDirPath,
-		daemonConfig,
+		networkConfig,
 		garageAdminToken,
 		hostBootstrap,
 	)
@@ -68,7 +68,7 @@ func (c *Children) newPmuxConfig(
 
 func (c *Children) postPmuxInit(
 	ctx context.Context,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	garageAdminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
@@ -79,7 +79,7 @@ func (c *Children) postPmuxInit(
 
 	c.logger.Info(ctx, "Waiting for garage instances to come online")
 	err := waitForGarage(
-		ctx, c.logger, daemonConfig, garageAdminToken, hostBootstrap,
+		ctx, c.logger, networkConfig, garageAdminToken, hostBootstrap,
 	)
 	if err != nil {
 		return fmt.Errorf("waiting for garage to start: %w", err)

go/daemon/config.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
+	"isle/bootstrap"
+	"isle/daemon/daecommon"
 	"os"
 	"path/filepath"
 	"slices"
@@ -40,6 +42,33 @@ var HTTPSocketPath = sync.OnceValue(func() string {
 	)
 })
 
+func pickNetworkConfig(
+	daemonConfig daecommon.Config, creationParams bootstrap.CreationParams,
+) (
+	daecommon.NetworkConfig, bool,
+) {
+	if c, ok := daemonConfig.Networks[creationParams.ID]; ok {
+		return c, true
+	}
+
+	if c, ok := daemonConfig.Networks[creationParams.Name]; ok {
+		return c, true
+	}
+
+	if c, ok := daemonConfig.Networks[creationParams.Domain]; ok {
+		return c, true
+	}
+
+	{ // DEPRECATED
+		c, ok := daemonConfig.Networks[daecommon.DeprecatedNetworkID]
+		if len(daemonConfig.Networks) == 1 && ok {
+			return c, true
+		}
+	}
+
+	return daecommon.NetworkConfig{}, false
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Jigs
 

go/daemon/daecommon/config.go

@@ -4,15 +4,20 @@ import (
 	"fmt"
 	"io"
 	"isle/bootstrap"
-	"isle/yamlutil"
+	"isle/toolkit"
 	"os"
 	"path/filepath"
 	"strconv"
 
-	"github.com/imdario/mergo"
 	"gopkg.in/yaml.v3"
 )
 
+const (
+	// Network ID used when translating from the old single-network daemon
+	// config to the multi-network config.
+	DeprecatedNetworkID = "_" // DEPRECATED
+)
+
 func defaultConfigPath(appDirPath string) string {
 	return filepath.Join(appDirPath, "etc", "daemon.yml")
 }
@@ -22,18 +27,10 @@ type ConfigTun struct {
 }
 
 type ConfigFirewall struct {
-	Conntrack ConfigConntrack      `yaml:"conntrack"`
 	Outbound []ConfigFirewallRule `yaml:"outbound"`
 	Inbound  []ConfigFirewallRule `yaml:"inbound"`
 }
 
-type ConfigConntrack struct {
-	TCPTimeout     string `yaml:"tcp_timeout"`
-	UDPTimeout     string `yaml:"udp_timeout"`
-	DefaultTimeout string `yaml:"default_timeout"`
-	MaxConnections int    `yaml:"max_connections"`
-}
-
 type ConfigFirewallRule struct {
 	Port   string   `yaml:"port,omitempty"`
 	Code   string   `yaml:"code,omitempty"`
@@ -61,8 +58,8 @@ type ConfigStorageAllocation struct {
 	Zone string `yaml:"zone"`
 }
 
-// Config describes the structure of the daemon config file.
+// NetworkConfig describes the configuration of a single network.
-type Config struct {
+type NetworkConfig struct {
 	DNS struct {
 		Resolvers []string `yaml:"resolvers"`
 	} `yaml:"dns"`
@@ -76,7 +73,37 @@ type Config struct {
 	} `yaml:"storage"`
 }
 
-func (c *Config) fillDefaults() {
+func (c *NetworkConfig) fillDefaults() {
+	if c.DNS.Resolvers == nil {
+		c.DNS.Resolvers = []string{
+			"1.1.1.1",
+			"8.8.8.8",
+		}
+	}
+
+	if c.VPN.Firewall.Outbound == nil {
+		c.VPN.Firewall.Outbound = []ConfigFirewallRule{
+			{
+				Port:  "any",
+				Proto: "any",
+				Host:  "any",
+			},
+		}
+	}
+
+	if c.VPN.Firewall.Inbound == nil {
+		c.VPN.Firewall.Inbound = []ConfigFirewallRule{
+			{
+				Port:  "any",
+				Proto: "icmp",
+				Host:  "any",
+			},
+		}
+	}
+
+	if c.VPN.Tun.Device == "" {
+		c.VPN.Tun.Device = "isle-tun"
+	}
 
 	var firewallGarageInbound []ConfigFirewallRule
 
@@ -116,6 +143,11 @@ func (c *Config) fillDefaults() {
 	)
 }
 
+// Config describes the structure of the daemon config file.
+type Config struct {
+	Networks map[string]NetworkConfig `yaml:"networks"`
+}
+
 // CopyDefaultConfig copies the daemon config file embedded in the AppDir into
 // the given io.Writer.
 func CopyDefaultConfig(into io.Writer, appDirPath string) error {
@@ -136,49 +168,42 @@ func CopyDefaultConfig(into io.Writer, appDirPath string) error {
 	return nil
 }
 
-// LoadConfig loads the daemon config from userConfigPath, merges it with
+// LoadConfig loads the daemon config from userConfigPath.
-// the default found in the appDirPath, and returns the result.
 //
 // If userConfigPath is not given then the default is loaded and returned.
-func LoadConfig(
+func LoadConfig(userConfigPath string) (Config, error) {
-	appDirPath, userConfigPath string,
+	if userConfigPath == "" {
-) (
+		return Config{}, nil
-	Config, error,
-) {
-
-	defaultConfigPath := defaultConfigPath(appDirPath)
-
-	var fullDaemon map[string]interface{}
-
-	if err := yamlutil.LoadYamlFile(&fullDaemon, defaultConfigPath); err != nil {
-		return Config{}, fmt.Errorf("parsing default daemon config file: %w", err)
 	}
 
-	if userConfigPath != "" {
+	userConfigB, err := os.ReadFile(userConfigPath)
-
-		var daemonConfig map[string]interface{}
-		if err := yamlutil.LoadYamlFile(&daemonConfig, userConfigPath); err != nil {
-			return Config{}, fmt.Errorf("parsing %q: %w", userConfigPath, err)
-		}
-
-		err := mergo.Merge(&fullDaemon, daemonConfig, mergo.WithOverride)
 	if err != nil {
-			return Config{}, fmt.Errorf("merging contents of file %q: %w", userConfigPath, err)
+		return Config{}, fmt.Errorf("reading from file: %w", err)
-		}
 	}
 
-	fullDaemonB, err := yaml.Marshal(fullDaemon)
+	{ // DEPRECATED
-
+		var config NetworkConfig
-	if err != nil {
+		_ = yaml.Unmarshal(userConfigB, &config)
-		return Config{}, fmt.Errorf("yaml marshaling: %w", err)
+		if !toolkit.IsZero(config) {
+			config.fillDefaults()
+			return Config{
+				Networks: map[string]NetworkConfig{
+					DeprecatedNetworkID: config,
+				},
+			}, nil
+		}
 	}
 
 	var config Config
-	if err := yaml.Unmarshal(fullDaemonB, &config); err != nil {
+	if err := yaml.Unmarshal(userConfigB, &config); err != nil {
 		return Config{}, fmt.Errorf("yaml unmarshaling back into Config struct: %w", err)
 	}
 
-	config.fillDefaults()
+	for id := range config.Networks {
+		network := config.Networks[id]
+		network.fillDefaults()
+		config.Networks[id] = network
+	}
 
 	return config, nil
 }

go/daemon/daemon.go

@@ -4,6 +4,7 @@ package daemon
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"isle/bootstrap"
 	"isle/daemon/children"
@@ -134,11 +135,13 @@ func New(
 			)
 		}
 
+		networkConfig, _ := pickNetworkConfig(daemonConfig, loadableNetworks[0])
+
 		d.network, err = network.Load(
 			ctx,
 			logger.WithNamespace("network"),
 			id,
-			d.daemonConfig,
+			networkConfig,
 			d.envBinDirPath,
 			networkStateDir,
 			networkRuntimeDir,
@@ -174,6 +177,13 @@ func (d *Daemon) CreateNetwork(
 	creationParams := bootstrap.NewCreationParams(name, domain)
 	ctx = mctx.WithAnnotator(ctx, creationParams)
 
+	networkConfig, ok := pickNetworkConfig(
+		d.daemonConfig, creationParams,
+	)
+	if !ok {
+		return errors.New("couldn't find network config for network being created")
+	}
+
 	d.l.Lock()
 	defer d.l.Unlock()
 
@@ -196,7 +206,7 @@ func (d *Daemon) CreateNetwork(
 	n, err := network.Create(
 		ctx,
 		d.logger.WithNamespace("network"),
-		d.daemonConfig,
+		networkConfig,
 		d.envBinDirPath,
 		networkStateDir,
 		networkRuntimeDir,
@@ -224,7 +234,12 @@ func (d *Daemon) CreateNetwork(
 func (d *Daemon) JoinNetwork(
 	ctx context.Context, newBootstrap network.JoiningBootstrap,
 ) error {
-	networkID := newBootstrap.Bootstrap.NetworkCreationParams.ID
+	var (
+		creationParams   = newBootstrap.Bootstrap.NetworkCreationParams
+		networkConfig, _ = pickNetworkConfig(d.daemonConfig, creationParams)
+		networkID        = creationParams.ID
+	)
+
 	ctx = mctx.WithAnnotator(ctx, newBootstrap.Bootstrap.NetworkCreationParams)
 
 	d.l.Lock()
@@ -247,7 +262,7 @@ func (d *Daemon) JoinNetwork(
 	n, err := network.Join(
 		ctx,
 		d.logger.WithNamespace("network"),
-		d.daemonConfig,
+		networkConfig,
 		newBootstrap,
 		d.envBinDirPath,
 		networkStateDir,

go/daemon/migrations.go

@@ -14,6 +14,7 @@ import (
 	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
+// DEPRECATED
 func migrateToMultiNetworkStateDirectory(
 	ctx context.Context, logger *mlog.Logger, envVars daecommon.EnvVars,
 ) error {

go/daemon/network/bootstrap.go

@@ -29,8 +29,8 @@ func writeBootstrapToStateDir(
 	return nil
 }
 
-func coalesceDaemonConfigAndBootstrap(
+func coalesceNetworkConfigAndBootstrap(
-	daemonConfig daecommon.Config, hostBootstrap bootstrap.Bootstrap,
+	networkConfig daecommon.NetworkConfig, hostBootstrap bootstrap.Bootstrap,
 ) (
 	bootstrap.Bootstrap, error,
 ) {
@@ -38,12 +38,12 @@ func coalesceDaemonConfigAndBootstrap(
 		HostAssigned: hostBootstrap.HostAssigned,
 		HostConfigured: bootstrap.HostConfigured{
 			Nebula: bootstrap.NebulaHost{
-				PublicAddr: daemonConfig.VPN.PublicAddr,
+				PublicAddr: networkConfig.VPN.PublicAddr,
 			},
 		},
 	}
 
-	if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
+	if allocs := networkConfig.Storage.Allocations; len(allocs) > 0 {
 
 		for i, alloc := range allocs {
 

go/daemon/network/garage.go

@@ -57,7 +57,7 @@ func garageAdminClientLogger(logger *mlog.Logger) *mlog.Logger {
 // or it will _panic_ if there is no local instance configured.
 func newGarageAdminClient(
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) *garage.AdminClient {
@@ -68,7 +68,7 @@ func newGarageAdminClient(
 		garageAdminClientLogger(logger),
 		net.JoinHostPort(
 			thisHost.IP().String(),
-			strconv.Itoa(daemonConfig.Storage.Allocations[0].AdminPort),
+			strconv.Itoa(networkConfig.Storage.Allocations[0].AdminPort),
 		),
 		adminToken,
 	)
@@ -77,18 +77,18 @@ func newGarageAdminClient(
 func garageApplyLayout(
 	ctx context.Context,
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) error {
 
 	var (
 		adminClient = newGarageAdminClient(
-			logger, daemonConfig, adminToken, hostBootstrap,
+			logger, networkConfig, adminToken, hostBootstrap,
 		)
 		thisHost = hostBootstrap.ThisHost()
 		hostName = thisHost.Name
-		allocs   = daemonConfig.Storage.Allocations
+		allocs   = networkConfig.Storage.Allocations
 		peers    = make([]garage.PeerLayout, len(allocs))
 	)
 
@@ -115,14 +115,14 @@ func garageApplyLayout(
 func garageInitializeGlobalBucket(
 	ctx context.Context,
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	adminToken string,
 	hostBootstrap bootstrap.Bootstrap,
 ) (
 	garage.S3APICredentials, error,
 ) {
 	adminClient := newGarageAdminClient(
-		logger, daemonConfig, adminToken, hostBootstrap,
+		logger, networkConfig, adminToken, hostBootstrap,
 	)
 
 	creds, err := adminClient.CreateS3APICredentials(

go/daemon/network/network.go

@@ -18,7 +18,6 @@ import (
 	"isle/nebula"
 	"isle/secrets"
 	"isle/toolkit"
-	"log"
 	"net/netip"
 	"slices"
 	"sync"
@@ -154,7 +153,7 @@ func (o *Opts) withDefaults() *Opts {
 
 type network struct {
 	logger        *mlog.Logger
-	daemonConfig daecommon.Config
+	networkConfig daecommon.NetworkConfig
 
 	envBinDirPath string
 	stateDir      toolkit.Dir
@@ -178,16 +177,15 @@ type network struct {
 func instatiateNetwork(
 	logger *mlog.Logger,
 	networkID string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	envBinDirPath string,
 	stateDir toolkit.Dir,
 	runtimeDir toolkit.Dir,
 	opts *Opts,
 ) *network {
-	log.Printf("DEBUG: network stateDir:%+v runtimeDir:%+v", stateDir, runtimeDir)
 	return &network{
 		logger:           logger,
-		daemonConfig:     daemonConfig,
+		networkConfig:    networkConfig,
 		envBinDirPath:    envBinDirPath,
 		stateDir:         stateDir,
 		runtimeDir:       runtimeDir,
@@ -227,7 +225,7 @@ func Load(
 	ctx context.Context,
 	logger *mlog.Logger,
 	networkID string,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	envBinDirPath string,
 	stateDir toolkit.Dir,
 	runtimeDir toolkit.Dir,
@@ -238,7 +236,7 @@ func Load(
 	n := instatiateNetwork(
 		logger,
 		networkID,
-		daemonConfig,
+		networkConfig,
 		envBinDirPath,
 		stateDir,
 		runtimeDir,
@@ -272,7 +270,7 @@ func Load(
 func Join(
 	ctx context.Context,
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	joiningBootstrap JoiningBootstrap,
 	envBinDirPath string,
 	stateDir toolkit.Dir,
@@ -284,7 +282,7 @@ func Join(
 	n := instatiateNetwork(
 		logger,
 		joiningBootstrap.Bootstrap.NetworkCreationParams.ID,
-		daemonConfig,
+		networkConfig,
 		envBinDirPath,
 		stateDir,
 		runtimeDir,
@@ -324,7 +322,7 @@ func Join(
 func Create(
 	ctx context.Context,
 	logger *mlog.Logger,
-	daemonConfig daecommon.Config,
+	networkConfig daecommon.NetworkConfig,
 	envBinDirPath string,
 	stateDir toolkit.Dir,
 	runtimeDir toolkit.Dir,
@@ -335,7 +333,7 @@ func Create(
 ) (
 	Network, error,
 ) {
-	if len(daemonConfig.Storage.Allocations) < 3 {
+	if len(networkConfig.Storage.Allocations) < 3 {
 		return nil, ErrInvalidConfig.WithData(
 			"At least three storage allocations are required.",
 		)
@@ -351,7 +349,7 @@ func Create(
 	n := instatiateNetwork(
 		logger,
 		creationParams.ID,
-		daemonConfig,
+		networkConfig,
 		envBinDirPath,
 		stateDir,
 		runtimeDir,
@@ -409,8 +407,8 @@ func (n *network) initialize(
 	// by the daemon config. This way the network has the most up-to-date
 	// possible bootstrap. This updated bootstrap will later get updated in
 	// garage as a background task, so other hosts will see it as well.
-	currBootstrap, err := coalesceDaemonConfigAndBootstrap(
+	currBootstrap, err := coalesceNetworkConfigAndBootstrap(
-		n.daemonConfig, currBootstrap,
+		n.networkConfig, currBootstrap,
 	)
 	if err != nil {
 		return fmt.Errorf("combining configuration into bootstrap: %w", err)
@@ -429,7 +427,7 @@ func (n *network) initialize(
 		n.logger.WithNamespace("children"),
 		n.envBinDirPath,
 		n.secretsStore,
-		n.daemonConfig,
+		n.networkConfig,
 		n.runtimeDir,
 		n.garageAdminToken,
 		currBootstrap,
@@ -467,10 +465,10 @@ func (n *network) initialize(
 }
 
 func (n *network) postInit(ctx context.Context) error {
-	if len(n.daemonConfig.Storage.Allocations) > 0 {
+	if len(n.networkConfig.Storage.Allocations) > 0 {
 		n.logger.Info(ctx, "Applying garage layout")
 		if err := garageApplyLayout(
-			ctx, n.logger, n.daemonConfig, n.garageAdminToken, n.currBootstrap,
+			ctx, n.logger, n.networkConfig, n.garageAdminToken, n.currBootstrap,
 		); err != nil {
 			return fmt.Errorf("applying garage layout: %w", err)
 		}
@@ -489,7 +487,7 @@ func (n *network) postInit(ctx context.Context) error {
 		garageGlobalBucketCreds, err := garageInitializeGlobalBucket(
 			ctx,
 			n.logger,
-			n.daemonConfig,
+			n.networkConfig,
 			n.garageAdminToken,
 			n.currBootstrap,
 		)
@@ -568,7 +566,7 @@ func (n *network) reload(
 	newBootstrap.Hosts[thisHost.Name] = thisHost
 
 	diff, err := children.CalculateReloadDiff(
-		n.daemonConfig, currBootstrap, newBootstrap,
+		n.networkConfig, currBootstrap, newBootstrap,
 	)
 	if err != nil {
 		return fmt.Errorf("calculating diff between bootstraps: %w", err)

go/toolkit/toolkit.go

@@ -1,3 +1,12 @@
 // Package toolkit contains useful utilities which are not specific to any
 // specific part of isle.
 package toolkit
+
+import "reflect"
+
+// IsZero returns true if the value is equal to its zero value according to
+// reflect.DeepEqual.
+func IsZero[T any](v T) bool {
+	var zero T
+	return reflect.DeepEqual(v, zero)
+}

tests/utils/with-1-data-1-empty-node-network.sh

@@ -33,6 +33,8 @@ if [ ! -d "$XDG_RUNTIME_DIR/isle" ]; then
     mkdir c
 
     cat >daemon.yml <<EOF
+    networks:
+      testing:
         vpn:
           public_addr: 127.0.0.1:60000
           tun: