9778444706
This reverts commit afbd4a984d.
The old configuration cannot be updated like this:
eve] error:
[eve] … while calling the 'head' builtin
[eve] at /nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/lib/attrsets.nix:1575:11:
[eve] 1574| || pred here (elemAt values 1) (head values) then
[eve] 1575| head values
[eve] | ^
[eve] 1576| else
[eve]
[eve] … while evaluating the attribute 'value'
[eve] at /nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/lib/modules.nix:809:9:
[eve] 808| in warnDeprecation opt //
[eve] 809| { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
[eve] | ^
[eve] 810| inherit (res.defsFinal') highestPrio;
[eve]
[eve] … while evaluating the option `system.build.toplevel':
[eve]
[eve] … while evaluating definitions from `/nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/nixos/modules/system/activation/top-level.nix':
[eve]
[eve] … while evaluating the option `assertions':
[eve]
[eve] … while evaluating definitions from `/nix/store/5b0hl2dnvr1sawqlkwmsnaiyqz00d34h-source/nixos/modules/system/boot/systemd.nix':
[eve]
[eve] … while evaluating the option `systemd.services':
[eve]
[eve] … while evaluating definitions from `/nix/store/kpzcdgndym0qm1w490mjvk9c2qmz03h5-source/nixosModules/clanCore/zerotier':
[eve]
[eve] … while evaluating the option `clan.core.networking.zerotier.networkId':
[eve]
[eve] (stack trace truncated; use '--show-trace' to show the full, detailed trace)
[eve]
[eve] error: A definition for option `clan.core.networking.zerotier.networkId' is not of type `null or string'. Definition values:
[eve] - In `/nix/store/kpzcdgndym0qm1w490mjvk9c2qmz03h5-source/nixosModules/clanCore/networking.nix':
[eve] {
[eve] _type = "override";
[eve] content = "267efd4a15b69623";
[eve] priorit
85 lines
2.5 KiB
Nix
85 lines
2.5 KiB
Nix
{ config, lib, ... }:
|
|
{
|
|
options.clan = {
|
|
networking = {
|
|
targetHost = lib.mkOption {
|
|
description = ''
|
|
The target SSH node for deployment.
|
|
|
|
By default, the node's attribute name will be used.
|
|
If set to null, only local deployment will be supported.
|
|
|
|
format: user@host:port&SSH_OPTION=SSH_VALUE
|
|
examples:
|
|
- machine.example.com
|
|
- user@machine2.example.com
|
|
- root@example.com:2222&IdentityFile=/path/to/private/key
|
|
'';
|
|
default = null;
|
|
type = lib.types.nullOr lib.types.str;
|
|
};
|
|
buildHost = lib.mkOption {
|
|
description = ''
|
|
The build SSH node where nixos-rebuild will be executed.
|
|
|
|
If set to null, the targetHost will be used.
|
|
|
|
format: user@host:port&SSH_OPTION=SSH_VALUE
|
|
examples:
|
|
- machine.example.com
|
|
- user@machine2.example.com
|
|
- root@example.com:2222&IdentityFile=/path/to/private/key
|
|
'';
|
|
type = lib.types.nullOr lib.types.str;
|
|
default = null;
|
|
};
|
|
};
|
|
|
|
deployment = {
|
|
requireExplicitUpdate = lib.mkOption {
|
|
description = ''
|
|
Do not update this machine when running `clan machines update` without any machines specified.
|
|
|
|
This is useful for machines that are not always online or are not part of the regular update cycle.
|
|
'';
|
|
type = lib.types.bool;
|
|
default = false;
|
|
};
|
|
};
|
|
};
|
|
|
|
imports = [
|
|
(lib.mkRenamedOptionModule
|
|
[
|
|
"clan"
|
|
"networking"
|
|
"deploymentAddress"
|
|
]
|
|
[
|
|
"clan"
|
|
"networking"
|
|
"targetHost"
|
|
]
|
|
)
|
|
];
|
|
config = {
|
|
# conflicts with systemd-resolved
|
|
networking.useHostResolvConf = false;
|
|
|
|
# Allow PMTU / DHCP
|
|
networking.firewall.allowPing = true;
|
|
|
|
# The notion of "online" is a broken concept
|
|
# https://github.com/systemd/systemd/blob/e1b45a756f71deac8c1aa9a008bd0dab47f64777/NEWS#L13
|
|
systemd.services.NetworkManager-wait-online.enable = false;
|
|
systemd.network.wait-online.enable = false;
|
|
|
|
systemd.network.networks."99-ethernet-default-dhcp".networkConfig.MulticastDNS = lib.mkDefault "yes";
|
|
systemd.network.networks."99-wireless-client-dhcp".networkConfig.MulticastDNS = lib.mkDefault "yes";
|
|
networking.firewall.allowedUDPPorts = [ 5353 ]; # Multicast DNS
|
|
|
|
# Use networkd instead of the pile of shell scripts
|
|
networking.useNetworkd = lib.mkDefault true;
|
|
};
|
|
}
|