Merge pull request 'template: remove invalid enable option for zerotier' (#1299) from hsjobeki-main into main
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
jon = {
|
jon = {
|
||||||
imports = [
|
imports = [
|
||||||
./modules/shared.nix
|
./modules/shared.nix
|
||||||
|
./modules/disko.nix
|
||||||
./machines/jon/configuration.nix
|
./machines/jon/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@
|
|||||||
# TODO: Example how to use disko for more complicated setups
|
# TODO: Example how to use disko for more complicated setups
|
||||||
|
|
||||||
# remote> lsblk --output NAME,PTUUID,FSTYPE,SIZE,MOUNTPOINT
|
# remote> lsblk --output NAME,PTUUID,FSTYPE,SIZE,MOUNTPOINT
|
||||||
clan.diskLayouts.singleDiskExt4 = {
|
disko.devices.disk.main = {
|
||||||
device = "/dev/disk/by-id/__CHANGE_ME__";
|
device = "/dev/disk/by-id/__CHANGE_ME__";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -62,11 +63,10 @@
|
|||||||
disko.devices.disk.main = {
|
disko.devices.disk.main = {
|
||||||
device = "/dev/disk/by-id/__CHANGE_ME__";
|
device = "/dev/disk/by-id/__CHANGE_ME__";
|
||||||
};
|
};
|
||||||
|
|
||||||
clan.networking.zerotier.networking.enable = true;
|
|
||||||
/*
|
/*
|
||||||
After jon is deployed, uncomment the following line
|
After jon is deployed, uncomment the following line
|
||||||
This will allow sara to share the VPN overlay network with jon
|
This will allow sara to share the VPN overlay network with jon
|
||||||
|
The networkId is generated by the first deployment of jon
|
||||||
*/
|
*/
|
||||||
# clan.networking.zerotier.networkId = builtins.readFile ../jon/facts/zerotier-network-id;
|
# clan.networking.zerotier.networkId = builtins.readFile ../jon/facts/zerotier-network-id;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user