darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove invtracker #86

Merged
DarkKirb merged 2 commits from remove-invtracker into main 2022-12-06 13:48:23 +00:00
Conversation 1 Commits 2 Files changed 5 +26 -212
5 changed files with 26 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/nixos-8gb-fsn1-1.nix
View file

@ -26,7 +26,6 @@
./services/reverse-proxy.nix ./services/reverse-proxy.nix
./services/matrix-media-repo.nix ./services/matrix-media-repo.nix
./bittorrent-blocker.nix ./bittorrent-blocker.nix
./services/invtracker.nix # Remove once prof is done grading
./services/akkoma ./services/akkoma
./services/peertube ./services/peertube
]; ];

67
config/services/invtracker.nix
View file

@ -1,67 +0,0 @@
{
pkgs,
invtracker,
...
}: let
port = 19689;
configFile = builtins.toFile "config.xml" ''
<?xml version="1.0" encoding="UTF-8"?>
<config>
<server host="127.0.0.1" port="${toString port}" />
<database url="jdbc:sqlite:test.db" />
</config>
'';
in {
systemd.services.invtracker = {
enable = true;
description = "InvTracker";
script = "${invtracker.packages.${pkgs.system}.invtracker-server}/bin/server ${configFile}";
serviceConfig = {
User = "invtracker";
Group = "invtracker";
WorkingDirectory = "/var/lib/invtracker";
Restart = "always";
};
wantedBy = ["multi-user.target"];
environment = {
JAVA_HOME = "${pkgs.openjdk_headless}";
};
};
services.caddy.virtualHosts."invtracker.chir.rs" = {
useACMEHost = "chir.rs";
extraConfig = ''
import baseConfig
handle_path /assets/* {
root * ${invtracker.packages.${pkgs.system}.invtracker-web}/assets
file_server {
precompressed zstd br gzip
}
}
handle_path /web/* {
root * ${invtracker.packages.${pkgs.system}.invtracker-web}
file_server {
precompressed zstd br gzip
}
try_files {path} /index.html
}
handle {
reverse_proxy http://localhost:${toString port}
}
'';
};
users.users.invtracker = {
description = "InvTracker";
home = "/var/lib/invtracker";
useDefaultShell = true;
group = "invtracker";
isSystemUser = true;
};
users.groups.invtracker = {};
systemd.tmpfiles.rules = [
"d '/var/lib/invtracker' 0750 invtracker invtracker - -"
"d '/var/lib/invtracker/media' 0750 invtracker invtracker - -"
];
}

120
flake.lock
View file

@ -1,28 +1,5 @@
{ {
"nodes": { "nodes": {
"android-nixpkgs": {
"inputs": {
"devshell": "devshell_2",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"invtracker",
"nixpkgs"
]
},
"locked": {
"lastModified": 1661286159,
"narHash": "sha256-LxYboPfFEOWaqFKjaXW8KiQUrDkII14h9dQOoCkyi+U=",
"owner": "tadfisher",
"repo": "android-nixpkgs",
"rev": "cbace2456982e90bad37075329b67836e9347ce3",
"type": "github"
},
"original": {
"owner": "tadfisher",
"repo": "android-nixpkgs",
"type": "github"
}
},
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -55,33 +32,6 @@
"type": "github" "type": "github"
} }
}, },
"devshell_2": {
"inputs": {
"flake-utils": [
"invtracker",
"android-nixpkgs",
"nixpkgs"
],
"nixpkgs": [
"invtracker",
"android-nixpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660811669,
"narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
"owner": "numtide",
"repo": "devshell",
"rev": "c2feacb46ee69949124c835419861143c4016fb5",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"dns": { "dns": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -281,36 +231,6 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -452,26 +372,6 @@
"type": "github" "type": "github"
} }
}, },
"invtracker": {
"inputs": {
"android-nixpkgs": "android-nixpkgs",
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1661695658,
"narHash": "sha256-TWOhptDKsQ4UpORh9rtgxgQUyo6Gfp14ZO0oI8zxHtk=",
"ref": "refs/heads/main",
"rev": "f19d9ac9d464c98ea2b37e5dee485efd1eb57ea3",
"revCount": 30,
"type": "git",
"url": "https://git.chir.rs/darkkirb/Programmierbeleg"
},
"original": {
"type": "git",
"url": "https://git.chir.rs/darkkirb/Programmierbeleg"
}
},
"libnbtplusplus": { "libnbtplusplus": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -554,7 +454,7 @@
}, },
"nix-packages": { "nix-packages": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -750,21 +650,6 @@
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1661323386,
"narHash": "sha256-7BxU3dM5oCAwMs8ggblXV0yAIGCfVK6l0vfDvoEIBs8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "678ac83e97abe80242d31a3e99915b19366db342",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1670314633, "lastModified": 1670314633,
"narHash": "sha256-id518l6bw5rtQoXw1AFt2H0endm7MhiZEcYFzhhyQ1o=", "narHash": "sha256-id518l6bw5rtQoXw1AFt2H0endm7MhiZEcYFzhhyQ1o=",
@ -849,10 +734,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hosts-list": "hosts-list", "hosts-list": "hosts-list",
"hydra": "hydra", "hydra": "hydra",
"invtracker": "invtracker",
"nix-packages": "nix-packages", "nix-packages": "nix-packages",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"nixpkgs-fluffychat": "nixpkgs-fluffychat", "nixpkgs-fluffychat": "nixpkgs-fluffychat",
"nixpkgs-libjxl-update": "nixpkgs-libjxl-update", "nixpkgs-libjxl-update": "nixpkgs-libjxl-update",
"nixpkgs-noto-variable": "nixpkgs-noto-variable", "nixpkgs-noto-variable": "nixpkgs-noto-variable",

1
flake.nix
View file

@ -18,7 +18,6 @@ rec {
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d"; nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d";
emanote.url = "github:EmaApps/emanote"; emanote.url = "github:EmaApps/emanote";
invtracker.url = "git+https://git.chir.rs/darkkirb/Programmierbeleg";
nixpkgs-fluffychat.url = "github:Luis-Hebendanz/nixpkgs/fix_mkFlutterApp"; nixpkgs-fluffychat.url = "github:Luis-Hebendanz/nixpkgs/fix_mkFlutterApp";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
hydra.url = "github:NixOS/hydra"; hydra.url = "github:NixOS/hydra";

49
zones/chir.rs.nix
View file

@ -45,27 +45,27 @@ with dns.lib.combinators; let
} }
]; ];
/* /*
subdomains = { subdomains = {
_tcp.subdomains."*".TLSA = [ _tcp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
_udp.subdomains."*".TLSA = [ _udp.subdomains."*".TLSA = [
{ {
certUsage = "dane-ee"; certUsage = "dane-ee";
selector = "spki"; selector = "spki";
match = "sha256"; match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f"; certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL; ttl = zoneTTL;
} }
]; ];
}; };
*/ */
HTTPS = [ HTTPS = [
{ {
svcPriority = 1; svcPriority = 1;
@ -102,7 +102,7 @@ with dns.lib.combinators; let
SOA = { SOA = {
nameServer = "ns1.chir.rs."; nameServer = "ns1.chir.rs.";
adminEmail = "lotte@chir.rs"; adminEmail = "lotte@chir.rs";
serial = 20; serial = 21;
}; };
NS = [ NS = [
"ns1.chir.rs." "ns1.chir.rs."
@ -171,7 +171,7 @@ with dns.lib.combinators; let
_keybase.TXT = [ _keybase.TXT = [
(ttl zoneTTL (txt "keybase-site-verification=r044cwg0wOTW-ws35BA5MMRLNwjdTNJ4uOu6kgdTopI")) (ttl zoneTTL (txt "keybase-site-verification=r044cwg0wOTW-ws35BA5MMRLNwjdTNJ4uOu6kgdTopI"))
]; ];
www = createZone {}; www = createZone {};
api = createZone {}; api = createZone {};
git = createZone {}; git = createZone {};
@ -186,14 +186,13 @@ with dns.lib.combinators; let
]; ];
matrix = createZone {}; matrix = createZone {};
drone = createZone {}; drone = createZone {};
invtracker = createZone {};
akko = createZone {}; akko = createZone {};
moa = createZone {}; moa = createZone {};
cache.CNAME = [ cache.CNAME = [
"cache-chir-rs.b-cdn.net." "cache-chir-rs.b-cdn.net."
]; ];
peertube = createZone {}; peertube = createZone {};
mediaproxy.CNAME = [ "mediaproxy-chir-rs.b-cdn.net." ]; mediaproxy.CNAME = ["mediaproxy-chir-rs.b-cdn.net."];
int = int =
delegateTo [ delegateTo [