refactor: put all wrtag config in config file
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
This commit is contained in:
parent
99cf1e7cc5
commit
6e6e3d9757
3 changed files with 8 additions and 29 deletions
|
|
@ -97,10 +97,7 @@
|
|||
|
||||
services.wrtagweb = {
|
||||
enable = true;
|
||||
envFile = config.sops.secrets.wrtagwebEnvFile.path;
|
||||
settings = {
|
||||
log-level = "DEBUG";
|
||||
};
|
||||
settingsFile = config.sops.secrets.wrtagwebConfigFile.path;
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."tag.escapeangle.com" = {
|
||||
|
|
@ -133,7 +130,7 @@
|
|||
slskdEnvFile = {
|
||||
owner = config.services.slskd.user;
|
||||
};
|
||||
wrtagwebEnvFile = {
|
||||
wrtagwebConfigFile = {
|
||||
owner = "wrtagweb";
|
||||
};
|
||||
bandcampcdCookieFile = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ storageboxKey: ENC[AES256_GCM,data:uWDkiWIk3OePRfoaqjllVlRVzW5+ryE4sIOs8qm6cS8JN
|
|||
storageboxCryptKey: ENC[AES256_GCM,data:ryYOzFvdPaVkOHmypYbqw+KU6aB2OQutLw==,iv:FL4c7P36qxYR1KJlg7t0dvFHlKGMIrTlQG+CDkeJu9U=,tag:Ia4mhV9Ed/m1rRMCNnHqXw==,type:str]
|
||||
slskdEnvFile: ENC[AES256_GCM,data:K1S1PXQMiBoEdbuM/NTBUYRrUSnAC/KBhm/PFzoCJATiLLPsstzgqzbe9vG8tnULb2driAH4Ytd03cmROp30V+9vW6J9eyCofWySWZNEYriRfY1y7y5AR8W13zQL0FGZOewUy/1T7YRvN8FjZFh4n7S3c0GREX3FSSNrmaHwOqgueDs=,iv:VziNMRpC2clhFyOMG8LRReMGUxhYqjUaZeA8gh599aM=,tag:H1tQBZ8nSgATSJB6nFSdlA==,type:str]
|
||||
bandcampcdCookieFile: ENC[AES256_GCM,data:vHw7utB2mAUiys+zBNpGDW9URdSMkWbvv0bZyNUgbDwHkg0ZkbxHBbnspbU4gM5AmUc0OPKjgoqaLEfy+mrylfyXxdKyVlLWGVDwH/9SjsgLjNWBnZOfS0/JN0h8nD9DDfQ9+KVKwfnndIBDwc3Qr+/uQe88JOWeN27ZZoqMXAA7y92aHAn/cdjV9opJL3zq2Gk9ZSjW6pX0W382/+P2d+n5pvnJCGaVcz6NqYj36V7eu+jqtCdpN0ugb7bEQLBEPxN6vDkB1EaWiuI+JXUqPyAlyRqH/9D9IKFu+HWVjryz6WILkJ8rpAEKUtgr4DUDgW/ukTp8/gCe/w126YljuGYj283WYZOTJQHnNdqZFur1qmIosSRLzw4atnD1CAEpZzHFXGz19wMk5+U3OkPQkC/PxmzhqQlyKw7JQ8rNu+WTcHmF3YqYZjtPj1aayXxLqQ9IbZOwXwa0BLRZX7FOFJz/znQa7kR2VE5/Q8vbYA3sz0gBQiIcl8VSzGtQlVM7K+TtkiUSA4DwKH+deSlUnjauIsLldENlbOWwDdm+ckdIRUUuIXiHRq9VM+1UPJdxLGScsPUgsIMZckIkdcEXDyBo3HPdwvQ0lX2msqTIyJxgBMyvSC37Frb0l7hiE6j5HndLv0nfT8krik12WpfR9PKjJqy6kIl3fwSwTqNHA7yPeQKHR8QizGXmkwxEBtsYufKE0Oi1u7VUwwyJe9IU2Gkr0TQYiHo7Glg0lNtkrpPIM+hOjxJJE2MVRe+S117RluvvfEjAmEhyb9cjW+TAw3kQttwO2vMk+RHV3mFF5G2/0tmRbvpbou68eFDDOBQ8ILrUo35GuR8ziPXJeJ+5EuCgePGavEP4qX4FX/GpnMEo85b6m5Vow5EOu8dakHX4fcFTPQeCZ0FoLTGYzGxqUsMG4E8upsPZMw4xBxeVjQO35l4FVhwNyrsIaep1mZWf5vBgAN4q2FYyfJ7jnClJkSrNxg0zW8sEgqEZXIZcFfhPYC1DWZZRMII5n8zJXoeGHDLEIuT4zeIpoXRN3+S4X3AFL4I/gm6mAbFQv3IJ8+g/EOThTZh0PRl70v0Imd3EDetjy4rKphPDpeb6QJWPQkWnIcIeE7Nkg19VoOcWmL8UDxUpsD0NIL1QSZ5ElBuoFVsKuOlkBD5UucLOGZgF01n4BXQjZ9DIW1xBm3lWDDxzuwh4F1rf2MvgesZCEGVn/Y3VF3YMGgdhxLht4IHo4w6z7Rzuh53acf6TH+uZ+iOmFaBETlxA17n6YyaCVzjCuyBNxAxTvX0y+49saYctF9PExYwoKtKL2X9u8NR2OoZJi+TPVfLwBxSrrr9et7Kxhlqu2zxqzWRt7xQXUxWL28HqZljBZxpOxdhy9XLCr3Aj2aZa1mH7zFX5hincsT/RiHEMdOXNUtJoQvBFe/HZ+uquM42Q90qf0alO+VT7kpa5anHLMfzwRKub6W7eFbTe5CD9SybwRDnB503WyreTUmDgIJNwoqePC+WYrW1RnBhI8ebdGl+34ou5CuJldqa1UTEzJNeNqCWLzrP/ThAcJRqmZJ945na6mmQqxhRp2edGu5+tIP3FzoHK2hUOlPyv5CgWGwXLCE0E1kP9Acpex53Wz/NxEa5eTB3ZlwsXNeI2fx4rwyAgtTVMQbzvuf3bVgIAN73I5mRfHRdTeKyQqgShtbEIoz2Q5TGvFNl2ALJ4bJzOVRo2LkUYTGHHH2x623o29fN8Ij35DRabVJyt1y5QGwVNWco=,iv:dgV9d8sRSwyNlW3lWZ6ldWw9+Fxs0Wmn1jhRxg5Pkfs=,tag:ZY3frrrk5/bBgx5lRMYvGg==,type:str]
|
||||
wrtagwebEnvFile: ENC[AES256_GCM,data:tWJT4ZnjqyudbH4oD6VDTmv86vrPESGG2Qx8x+bg61msIiaS1t6fHU8vTCL5WiJ3c7K1Hlr8zu4Ss9Xgru469uduzXHaX8DbPfSpBekit4MpJQ4l3sRpxn2ss5uzApxgxTUH/vEf07+oijDSICNeGbSbNl/6imJ+JhmDb8MqP6h3uvEOZB7Boyx0M8La8EWN3db3OmSkeFM+QQ9Jseni5ucKKw==,iv:sD5P5ZbNwlmxRb7iPs5MKtiPgQVrZ78IkmVuxQQLKkw=,tag:RJTZy9ruwx0MGawTE8NgdQ==,type:str]
|
||||
wrtagwebConfigFile: ENC[AES256_GCM,data:cswlwIz+IpbcnY9WIJIphFu8kRIPMNT/qU6ea9o7dfiin03v1Kzd6Dvoxn1tfcEU03/ARS1j7GZzhO+EOiet1h1tyuWyOlE0WnVxKmJaZg8/hO4+0Qgxa17VRCfB2KaDDMTPdTmcgDyTKDNUzfbOtnDnJCNBYaWWcfY7JyvSpA4r8X6RwIVQ2hZB2R7pgKaqi26IIdcaRGd/M6VzknaEJpPQZTlHHvvXjMmWT4Li2VoXPbJX/qR5/QfjlSwtcmQiJcj+wOGEdYChpFufo4XBsfU5696lrS4/li8J5Yl760hpuAXaoiOb2JWnYAqTHFx5MtOylCKvlwBdAI+ymwfFdpeNQHyZxigpFqx1BzOCl5TXVlfssEJOFL8BXQZABInoMXCDlGIxqIptCS8QkxY0D8v2QEreqe173pJNR5SwDNWPFeGk7BLO1QtN/s36/25ovnsPKD05WnE15SblclG5e6bGT6qml3XGI0o8/BVhN6Z6zlyiabFb57WSAt8T1TdWFZdqgjZoplAa5WwbDzXXxM6iQPFgdevc5jHH0rjVc3Ov1qN6YupkMzWaTb/BxyvEvndGjdS2ZYK8SF2ksbyn9SJL8ZL1sGReSUoKzoO0fphYU2Bwstf4fFpgo88IbjLVkqOpB7SS2DsMAU7wINEE+U74J2pwt3D5cOMsW9NzoVTBVSDpUCCk/PbQO4TE9e1Dq7b00wVsyS+n6yBGM8mO5nNuWjI38axyK2pXLaH64bShB73OE5HhgKWQXRedXwamHQ9fs5aOcWvjrQTT2N3uUck+rumURkSY5gYQYtDNS9OP/cDOiJnH5CHhxJargZHi7BKbbjI=,iv:CUhoc80mc/vrLhxCpCMlWXmz8vWCmnRxfoTjbvKDRHg=,tag:PofI/JknefygL2LBfBEgCw==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- recipient: age1hvrssz7k9akz66evj4kja53zvdtrss8k2ljxsh5myh2mru62sggqznlzrt
|
||||
|
|
@ -15,8 +15,8 @@ sops:
|
|||
b1ZqUzZLUkFwNHJyVlhmK0FOZ1JFYUEKDU4NmBCHRY+ZK+RFK/LioGzjJTaOE1ky
|
||||
MC6jxt7Y5RkCk0BBqeoEVLaNXNViPjwakbvyfH0w0P6l0KDJ4mNlYQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2025-10-07T14:48:18Z"
|
||||
mac: ENC[AES256_GCM,data:q/1KjSsLTUsTVCdMevgF4FkLeTJCVpjVOv6xRJOYcV0+Ib5FQnGDtzcD8PJHvd1AO9jW91iXufYsPfJXEKeuuCbZDRz+q97yIVQJgWCUk9LS1gZB9HbBkzEecqZM5ULkgh+xqAlGIdYrPe0MADahctzJBDiLtV6EeoVS6dRbQDA=,iv:kRRbtzqgRy5IJ2Y6FR2nfzB7fAEGO++biZjqwfURn3g=,tag:eR7FPIZ6M1TvpOsA1Zw77w==,type:str]
|
||||
lastmodified: "2025-10-07T15:50:08Z"
|
||||
mac: ENC[AES256_GCM,data:wgFMGyM14m53BGCXqm4o9daPkx4wacoR/Q99hpd4m9qjn0XT54uj40os9Uvvc7koB4GDiJO3Eswkuk2dmNTQDR8WO6ir5vQF9ohDZNy5Z2Yk7VhWHFF3PNTz2pViyVflENtFMPwuWeuBVzVyjqlxXZGeqaP2miQzbd63XmmCoTs=,iv:It2Q2UE0OiGmqe66EdvT/kZtIHUQ2rWPNcbtSUcUv0E=,tag:YxdN/XEoZwzNif1w0u4V4Q==,type:str]
|
||||
pgp:
|
||||
- created_at: "2025-09-18T21:32:42Z"
|
||||
enc: |-
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.services.wrtagweb;
|
||||
settingsFormat = pkgs.formats.keyValue {
|
||||
mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
|
||||
listsAsDuplicateKeys = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
|
@ -17,25 +13,12 @@ in
|
|||
|
||||
enable = lib.mkEnableOption "wrtag web";
|
||||
|
||||
settings = lib.mkOption rec {
|
||||
type = settingsFormat.type;
|
||||
apply = lib.recursiveUpdate default;
|
||||
default = {
|
||||
web-listen-addr = "127.0.0.1:7373";
|
||||
path-format = "/data/music/{{ artists .Release.Artists | sort | join \"; \" | safepath }}/({{ .Release.ReleaseGroup.FirstReleaseDate.Year }}) {{ .Release.Title | safepath }}{{ if not (eq .ReleaseDisambiguation \"\") }} ({{ .ReleaseDisambiguation | safepath }}){{ end }}/{{ pad0 2 .TrackNum }}.{{ len .Tracks | pad0 2 }} {{ if .IsCompilation }}{{ artistsString .Track.Artists | safepath }} - {{ end }}{{ .Track.Title | safepath }}{{ .Ext }}";
|
||||
};
|
||||
description = ''
|
||||
Configuration for wrtagweb
|
||||
'';
|
||||
};
|
||||
|
||||
envFile = lib.mkOption {
|
||||
settingsFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = ''
|
||||
File with environment variables for wrtagweb
|
||||
Configuration file for wrtagweb
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -53,8 +36,7 @@ in
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "wrtagweb";
|
||||
ExecStart = "${pkgs.unstable.wrtag}/bin/wrtagweb -config-path ${settingsFormat.generate "wrtagweb" cfg.settings}";
|
||||
EnvironmentFile = cfg.envFile;
|
||||
ExecStart = "${pkgs.unstable.wrtag}/bin/wrtagweb -config-path ${cfg.settingsFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue