yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reapply "clan.core: rename clan.{deployment,networking} -> clan.core.{deployment,networking}"

Browse Source 
This reverts commit 71009f80d8.

workaround upstream bug: https://github.com/NixOS/nixpkgs/issues/324802
This commit is contained in:
DavHau
2024-07-05 19:28:11 +07:00
parent e81906881b
commit 79d6f8e893
21 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/site/getting-started/configure.md
View File

@@ -89,7 +89,7 @@ Adding or configuring a new machine requires two simple steps:
# Change this to the correct ip-address or hostname
# The hostname is the machine name by default
clan.networking.targetHost = pkgs.lib.mkDefault "root@jon"
clan.core.networking.targetHost = pkgs.lib.mkDefault "root@jon"
# Change this to the ID-LINK of the desired disk shown by 'lsblk'
disko.devices.disk.main = {
@@ -122,7 +122,7 @@ Adding or configuring a new machine requires two simple steps:
# Change this to the correct ip-address or hostname
# The hostname is the machine name by default
clan.networking.targetHost = pkgs.lib.mkDefault "root@jon"
clan.core.networking.targetHost = pkgs.lib.mkDefault "root@jon"
# Change this to the ID-LINK of the desired disk shown by 'lsblk'
disko.devices.disk.main = {

4
docs/site/getting-started/deploy.md
View File

@@ -160,7 +160,7 @@ buildClan {
# Set this for clan commands use ssh i.e. `clan machines update`
# If you change the hostname, you need to update this line to root@<new-hostname>
# This only works however if you have avahi running on your admin machine else use IP
clan.networking.targetHost = pkgs.lib.mkDefault "root@jon";
clan.core.networking.targetHost = pkgs.lib.mkDefault "root@jon";
};
};
};
@@ -197,7 +197,7 @@ buildClan {
# ...
machines = {
"jon" = {
clan.networking.buildHost = "root@<host_or_ip>";
clan.core.networking.buildHost = "root@<host_or_ip>";
};
};
};

4
docs/site/getting-started/flake-parts.md
View File

@@ -75,7 +75,7 @@ Below is a guide on how to structure this in your flake.nix:
nixpkgs.hostPlatform = "x86_64-linux";
# Set this for clan commands use ssh i.e. `clan machines update`
clan.networking.targetHost = pkgs.lib.mkDefault "root@jon";
clan.core.networking.targetHost = pkgs.lib.mkDefault "root@jon";
# remote> lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
disko.devices.disk.main = {
@@ -83,7 +83,7 @@ Below is a guide on how to structure this in your flake.nix:
};
# There needs to be exactly one controller per clan
clan.networking.zerotier.controller.enable = true;
clan.core.networking.zerotier.controller.enable = true;
};
};

4
docs/site/getting-started/mesh-vpn.md
View File

@@ -29,7 +29,7 @@ peers. Once addresses are allocated, the controller's continuous operation is no
2. **Add Configuration**: Input the following configuration to the NixOS
configuration of the controller machine:
```nix
clan.networking.zerotier.controller = {
clan.core.networking.zerotier.controller = {
enable = true;
public = true;
};
@@ -48,7 +48,7 @@ To introduce a new machine to the VPN, adhere to the following steps:
configuration, substituting `<CONTROLLER>` with the controller machine name:
```nix
{ config, ... }: {
clan.networking.zerotier.networkId = builtins.readFile (config.clan.core.clanDir + "/machines/<CONTROLLER>/facts/zerotier-network-id");
clan.core.networking.zerotier.networkId = builtins.readFile (config.clan.core.clanDir + "/machines/<CONTROLLER>/facts/zerotier-network-id");
}
```
1. **Update the New Machine**: Execute: