chore: bump and fix raptus & shan

This commit is contained in:
Nydragon 2024-12-03 02:00:27 +01:00
parent 04b687340c
commit 386f4d064e
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
4 changed files with 15 additions and 8 deletions

View file

@ -15,7 +15,7 @@ let
}; };
in in
{ {
services.headscale.settings.acl_policy_path = pkgs.writeTextFile { services.headscale.settings.policy.path = pkgs.writeTextFile {
name = "headscale-acl.hujson"; name = "headscale-acl.hujson";
text = builtins.toJSON { text = builtins.toJSON {
acls = [ acls = [

View file

@ -1,13 +1,14 @@
{ {
config = { config = {
services.headscale.settings.dns_config = { services.headscale.settings.dns = {
override_local_dns = true; override_local_dns = true;
magic_dns = true; magic_dns = true;
base_domain = "ts";
# FIX: shan being down takes down entire tailnet # FIX: shan being down takes down entire tailnet
# 1 -> move dns to dedicated device # 1 -> move dns to dedicated device
# 2 -> find out if fallback dns's are supported by headscale # 2 -> find out if fallback dns's are supported by headscale
nameservers = [ nameservers.global = [
"100.64.0.4" "100.64.0.4"
]; ];
extra_records = extra_records =
@ -43,6 +44,7 @@
"paperless" "paperless"
"truenas" "truenas"
"fritz" "fritz"
"dav"
]; ];
}; };
}; };

View file

@ -32,7 +32,7 @@
kitchenowl = { kitchenowl = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
version = "v0.5.2"; version = "v0.6.4";
}; };
nginxproxymanager = { nginxproxymanager = {
enable = true; enable = true;

View file

@ -48,7 +48,7 @@ in
settings = options.services.navidrome.settings; settings = options.services.navidrome.settings;
restartPolicy = mkOption { restartPolicy = mkOption {
type = str; type = str;
default = "on-failure"; default = "always";
defaultText = '' defaultText = ''
Refer to https://www.mankier.com/5/systemd.service#Options-Restart for possible values, Refer to https://www.mankier.com/5/systemd.service#Options-Restart for possible values,
defines the restart behaviour in case the program ends. defines the restart behaviour in case the program ends.
@ -75,9 +75,14 @@ in
} // cfg.settings; } // cfg.settings;
}; };
systemd.services.navidrome.serviceConfig = { systemd.services.navidrome = {
Restart = cfg.restartPolicy; serviceConfig = {
EnvironmentFile = config.age.secrets.navidrome.path; Restart = cfg.restartPolicy;
EnvironmentFile = config.age.secrets.navidrome.path;
};
unitConfig = {
RequiresMountsFor = mkIf (cfg.library.type == "nfs") [ cfg.library.path ];
};
}; };
}; };
} }