motiejus
/
config
1
Fork 0
Code Packages Releases Activity

friendlyport

This commit is contained in:
Motiejus Jakštys 2023-08-05 18:00:43 +03:00
parent 43d6d25dd0
commit f4e04faef3
4 changed files with 110 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/vno1-oh2/configuration.nix
View File

@ -106,6 +106,12 @@
services = { services = {
tailscale.enable = true; tailscale.enable = true;
#grafana = {
# enable = true;
# domain = "vno1-oh2.servers.jakst"; # TODO tailscale service?
# addr = myData.hosts."vno1-oh2.servers.jakst".jakstIP;
#};
nsd = { nsd = {
enable = true; enable = true;
interfaces = ["0.0.0.0" "::"]; interfaces = ["0.0.0.0" "::"];

1
modules/services/default.nix
View File

@ -6,6 +6,7 @@
}: { }: {
imports = [ imports = [
./deployerbot ./deployerbot
./friendlyport
./postfix ./postfix
./syncthing ./syncthing
./zfsunlock ./zfsunlock

24
modules/services/friendlyport/default.nix Normal file
View File

@ -0,0 +1,24 @@
{
config,
lib,
myData,
...
}: {
options.mj.services.friendlyport = with lib.types; {
ports = lib.mkOption {
type = listOf int;
default = [];
};
};
config = let
ports = builtins.concatStringsSep "," (map builtins.toString config.mj.services.friendlyport.ports);
hosts = lib.attrVals ["mxp10.motiejus.jakst" "fwmine.motiejus.jakst"] myData.hosts;
ips = lib.catAttrs "jakstIP" hosts;
startLines = map (ip: "iptables -A INPUT -p tcp --match multiport --dports ${ports} --source ${ip} -j ACCEPT") ips;
stopLines = map (ip: "iptables -D INPUT -p tcp --match multiport --dports ${ports} --source ${ip} -j ACCEPT") ips;
in {
networking.firewall.extraCommands = lib.concatLines startLines;
networking.firewall.extraStopCommands = lib.concatLines stopLines;
};
}

165
modules/services/syncthing/default.nix
View File

@ -13,97 +13,90 @@ in {
dataDir = lib.mkOption {type = path;}; dataDir = lib.mkOption {type = path;};
}; };
config = let config = lib.mkIf config.mj.services.syncthing.enable {
hosts = lib.attrVals ["mxp10.motiejus.jakst" "fwmine.motiejus.jakst"] myData.hosts; mj.services.friendlyport.ports = [8384];
ips = lib.catAttrs "jakstIP" hosts;
startLines = map (ip: "iptables -A INPUT -p tcp --dport 8384 -s ${ip} -j ACCEPT") ips;
stopLines = map (ip: "iptables -D INPUT -p tcp --dport 8384 -s ${ip} -j ACCEPT") ips;
in
lib.mkIf config.mj.services.syncthing.enable {
networking.firewall.extraCommands = lib.concatLines startLines;
networking.firewall.extraStopCommands = lib.concatLines stopLines;
services.syncthing = { services.syncthing = {
enable = config.mj.services.syncthing.enable; enable = config.mj.services.syncthing.enable;
openDefaultPorts = true; openDefaultPorts = true;
guiAddress = let guiAddress = let
fqdn = with config.networking; "${hostName}.${domain}"; fqdn = with config.networking; "${hostName}.${domain}";
jakstIP = lib.getAttrFromPath [fqdn "jakstIP"] myData.hosts; jakstIP = lib.getAttrFromPath [fqdn "jakstIP"] myData.hosts;
guiPortStr = builtins.toString guiPort; guiPortStr = builtins.toString guiPort;
in "${jakstIP}:${guiPortStr}"; in "${jakstIP}:${guiPortStr}";
user = config.mj.services.syncthing.user; user = config.mj.services.syncthing.user;
group = config.mj.services.syncthing.group; group = config.mj.services.syncthing.group;
dataDir = config.mj.services.syncthing.dataDir; dataDir = config.mj.services.syncthing.dataDir;
extraOptions.gui.insecureAdminAccess = true; extraOptions.gui.insecureAdminAccess = true;
devices = devices =
{} {}
// (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
"fwmine".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; "fwmine".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6";
"mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN"; "mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN";
"rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH"; "rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH";
"KrekenavosNamai".id = "CYZDYL6-YMW7SZ3-K6IJO4Q-6NOULSG-OVZ3BGN-6LN3CLR-P3BJFKW-2PMHJQT"; "KrekenavosNamai".id = "CYZDYL6-YMW7SZ3-K6IJO4Q-6NOULSG-OVZ3BGN-6LN3CLR-P3BJFKW-2PMHJQT";
}) })
// {}; // {};
folders = { folders = {
"${config.services.syncthing.dataDir}/annex2/Books" = { "${config.services.syncthing.dataDir}/annex2/Books" = {
devices = ["mxp10" "fwmine"]; devices = ["mxp10" "fwmine"];
id = "8lk0n-mm63y"; id = "8lk0n-mm63y";
label = "Books"; label = "Books";
}; };
"${config.services.syncthing.dataDir}/annex2/M-Active" = { "${config.services.syncthing.dataDir}/annex2/M-Active" = {
devices = ["mxp10" "fwmine"]; devices = ["mxp10" "fwmine"];
id = "f6fma-unkxq"; id = "f6fma-unkxq";
label = "M-Active"; label = "M-Active";
}; };
"${config.services.syncthing.dataDir}/annex2/M-Camera" = { "${config.services.syncthing.dataDir}/annex2/M-Camera" = {
devices = ["mxp10" "fwmine"]; devices = ["mxp10" "fwmine"];
id = "pixel_xl_dtm3-photos"; id = "pixel_xl_dtm3-photos";
label = "M-Active"; label = "M-Active";
}; };
"${config.services.syncthing.dataDir}/annex2/M-Documents" = { "${config.services.syncthing.dataDir}/annex2/M-Documents" = {
devices = ["fwmine"]; devices = ["fwmine"];
id = "4fu7z-z6es2"; id = "4fu7z-z6es2";
label = "M-Documents"; label = "M-Documents";
}; };
"${config.services.syncthing.dataDir}/annex2/R-Documents" = { "${config.services.syncthing.dataDir}/annex2/R-Documents" = {
devices = ["rzj-744P2PE"]; devices = ["rzj-744P2PE"];
id = "nm23h-aog6k"; id = "nm23h-aog6k";
label = "R-Documents"; label = "R-Documents";
}; };
"${config.services.syncthing.dataDir}/annex2/Pictures" = { "${config.services.syncthing.dataDir}/annex2/Pictures" = {
devices = ["fwmine"]; devices = ["fwmine"];
id = "d3hur-cbzyw"; id = "d3hur-cbzyw";
label = "Pictures"; label = "Pictures";
}; };
"${config.services.syncthing.dataDir}/annex2/M-R" = { "${config.services.syncthing.dataDir}/annex2/M-R" = {
devices = ["fwmine" "rzj-744P2PE" "mxp10"]; devices = ["fwmine" "rzj-744P2PE" "mxp10"];
id = "evgn9-ahngz"; id = "evgn9-ahngz";
label = "M-R"; label = "M-R";
}; };
"${config.services.syncthing.dataDir}/stud-cache" = { "${config.services.syncthing.dataDir}/stud-cache" = {
devices = ["fwmine"]; devices = ["fwmine"];
id = "2kq7n-jqzxj"; id = "2kq7n-jqzxj";
label = "stud-cache"; label = "stud-cache";
}; };
"${config.services.syncthing.dataDir}/video/shared" = { "${config.services.syncthing.dataDir}/video/shared" = {
devices = ["mxp10" "fwmine"]; devices = ["mxp10" "fwmine"];
id = "byzmw-f6zhg"; id = "byzmw-f6zhg";
label = "video-shared"; label = "video-shared";
}; };
"${config.services.syncthing.dataDir}/music" = { "${config.services.syncthing.dataDir}/music" = {
devices = ["fwmine" "mxp10"]; devices = ["fwmine" "mxp10"];
id = "tg94v-cqcwr"; id = "tg94v-cqcwr";
label = "music"; label = "music";
}; };
"${config.services.syncthing.dataDir}/irenos" = { "${config.services.syncthing.dataDir}/irenos" = {
devices = ["KrekenavosNamai"]; devices = ["KrekenavosNamai"];
id = "wuwai-qkcqj"; id = "wuwai-qkcqj";
label = "Irenos"; label = "Irenos";
};
}; };
}; };
}; };
};
} }