Jafner/Jafner.net
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

Enhancement: Update iscsi.

Browse Source 
- Deprecate barbarian.
  - Reorganize iscsi vars.
  - Add filesystem mount for iscsi.
This commit is contained in:
Joey Hafner 2025-02-06 14:04:20 -08:00
parent 113c5f8448
commit 8d1541c903
Signed by: Jafner
GPG Key ID: 6D9A24EF2F389E55
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dotfiles/systems/fighter/network-shares.nix
View File

@ -1,11 +1,8 @@
{ pkgs, sys, ... }: let { pkgs, sys, ... }: let
iqn = "iqn.2020-03.net.jafner:fighter";
portals = { iscsi = {
barbarian = { iqn = "iqn.2020-03.net.jafner:fighter";
ip = "192.168.1.10"; portal = { # For Paladin
port = "3260";
};
paladin = {
ip = "192.168.1.12"; ip = "192.168.1.12";
port = "3260"; port = "3260";
}; };
@ -13,31 +10,19 @@
in { in {
services.openiscsi = { services.openiscsi = {
enable = true; enable = true;
name = iqn; name = iscsi.iqn;
discoverPortal = "${portals.paladin.ip}:${portals.paladin.port}"; discoverPortal = "${iscsi.portal.ip}:${iscsi.portal.port}";
}; };
systemd.services = { systemd.services = {
iscsi-autoconnect-paladin = { iscsi-autoconnect-paladin = {
description = "Log into iSCSI target ${iqn} on paladin"; description = "Log into iSCSI target ${iscsi.iqn} on paladin";
after = [ "network.target" "iscsid.service" ]; after = [ "network.target" "iscsid.service" ];
wants = [ "iscsid.service" ]; wants = [ "iscsid.service" ];
serviceConfig = { serviceConfig = {
ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${portals.paladin.ip}:${portals.paladin.port}"; ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${iscsi.portal.ip}:${iscsi.portal.port}";
ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.paladin.ip}:${portals.paladin.port} --login"; ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iscsi.iqn} -p ${iscsi.portal.ip}:${iscsi.portal.port} --login";
ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.paladin.ip}:${portals.paladin.port} --logout"; ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iscsi.iqn} -p ${iscsi.portal.ip}:${iscsi.portal.port} --logout";
Restart = "on-failure";
RemainAfterExit = true;
};
};
iscsi-autoconnect-barbarian = {
description = "Log into iSCSI target ${iqn} on barbarian";
after = [ "network.target" "iscsid.service" ];
wants = [ "iscsid.service" ];
serviceConfig = {
ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${portals.barbarian.ip}:${portals.barbarian.port}";
ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.barbarian.ip}:${portals.barbarian.port} --login";
ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.barbarian.ip}:${portals.barbarian.port} --logout";
Restart = "on-failure"; Restart = "on-failure";
RemainAfterExit = true; RemainAfterExit = true;
}; };
@ -88,5 +73,15 @@ in {
device = "//192.168.1.12/Torrenting"; device = "//192.168.1.12/Torrenting";
inherit fsType options; inherit fsType options;
}; };
"/mnt/iscsi/fighter" = {
device = "/dev/disk/by-uuid/cf3a253c-e792-48b5-89a1-f91deb02b3be";
fsType = "ext4";
options = [
"nofail"
"auto"
"users"
"x-systemd.automount"
];
};
}; };
} }