Compare commits

...

3 commits

Author SHA1 Message Date
c916eaea89
refactor: put all wrtag config in config file
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
2025-10-07 17:22:56 +02:00
99cf1e7cc5
fix: gonic uri
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
2025-10-07 16:48:34 +02:00
911e9bb133
chore: set wrtagweb log level to debug
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
2025-10-07 10:31:06 +02:00
3 changed files with 8 additions and 26 deletions

View file

@ -97,7 +97,7 @@
services.wrtagweb = {
enable = true;
envFile = config.sops.secrets.wrtagwebEnvFile.path;
settingsFile = config.sops.secrets.wrtagwebConfigFile.path;
};
services.nginx.virtualHosts."tag.escapeangle.com" = {
@ -130,7 +130,7 @@
slskdEnvFile = {
owner = config.services.slskd.user;
};
wrtagwebEnvFile = {
wrtagwebConfigFile = {
owner = "wrtagweb";
};
bandcampcdCookieFile = {

View file

@ -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:FAgsUk2b6+zVwIbDecE0sPET/2qOtLIoUO7uluEyiuoVvERAjqb2itUHea7Gwo0I3ws4J6OzXgVbMHC7AapyiG2LwBoChk1xqlRtdHHxXeCxLnnnjgPB2COIFdKXtDKjJ0TNHBggVMCdpVx/pWdOw0TfKQU9FmKHpwb01fhEBeS7IPjLA6tki3CU7YR1/QNSM4xQrWfyZoZme9VFRXeu57RW412YE8ky,iv:w7B2FfsEl3H6HvTm/cPgBTczYQ2MLkC1oyyzP4KW5Yk=,tag:7MBmOdjXmLskKxuMe6E7LQ==,type:str]
wrtagwebConfigFile: ENC[AES256_GCM,data:oWcFJJwPbfrZSIJ9lyPoUE+Eh5S3so987c0ajgNaMR7t2ZIdsP1w8lA9mIkc7+tPhnusanSRFnHqNq+SDAEmjJKhAap2EMAr2Cp45yWrFskCPB68mY4iCLCt9aGxZDLdac3xCgz8o/nO224VuQGxqD8NjxCPdB8mWpQRkvqeN9Uf6s4cm0vMXSLu0I+cYUoG1thw6gurR79gj+19HJ9NWFq5PubyS+VpEvsW5NOVHekSg08JCP4tmADJhLMQdpHEppEgd2Ejo1atfXNsuGf516YUqgg2lHjRUPBAtn8okpY4Cvqws2jCbDqkYB5toF4DQVNFxXQkIG3CYCaRgYsTZ9XJ8rqxpWvTwopQVCcqt+gbwVQ5LHhgCQbciY7QqFkpNXdDhF1jBjX9L16b5r3xa5sHoSGkl6hRUlHeJal7GxuU+4a0gp/HUqQU+QdwcbV4MuPboZp8QqlZtdavQsc4PUccEOWVumJckuZAbl0sLJ4cEnncPGQiB30sB3pnPlbemvwoDe5CGyuVeCiZ3/vzhhWru47TMSe/ArucgcbFMaY2HHDpz7qc2NX3vtkV4onmY43woB5+zEl2dYwNKPOfRGn+OwpEU0ny29Z+RITfJFJRkcC7GmAuYTY6QG+HgKE/uPt8ghs743URhb0iNK45kcmv/AlD2g2XEDlhGIEaQUqmPzve9juJPcco3UMPJAqmTBnEFwQP9NE957fQQI6daXrgnyezO2l2IWq/oHNNk4uGzQY1vr+UeCzhaLm8Ifs4BqWviczD/+GQkGeEhQ5G9Ej3yYP3zkmY1L9G1Ij/6qtCkpiAoYj0zbTTO29QZRgC8nsHVhw=,iv:0LkSW6fRwDl0nCNPQDWiO9eqGLAFUTgMzqNtf5kIBLo=,tag:lG0C6OqYigZOEuFRj2r2Mw==,type:str]
sops:
age:
- recipient: age1hvrssz7k9akz66evj4kja53zvdtrss8k2ljxsh5myh2mru62sggqznlzrt
@ -15,8 +15,8 @@ sops:
b1ZqUzZLUkFwNHJyVlhmK0FOZ1JFYUEKDU4NmBCHRY+ZK+RFK/LioGzjJTaOE1ky
MC6jxt7Y5RkCk0BBqeoEVLaNXNViPjwakbvyfH0w0P6l0KDJ4mNlYQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-10-06T22:19:06Z"
mac: ENC[AES256_GCM,data:Do+2U9sPLCROLvomNrUhG5kQh/ygQb/3ipn+GcnT7sppwXKhA8Jt2zX4T1BkKlPB88rtczXNF3BP7Oi1XD1BHiqTucWl4NkX0YfCE2YTs/c5dujlSfv5+iueE8qveo+S0+nI5UqgcV3kdyBLc8EA8c8ucLKPpbQLzlvKPqNmeh8=,iv:J7+CRZZ2xBJ2ugleFaJd1aNgidPdrJWYxC+bTQEATKQ=,tag:NZQlec9FUAzL5tNGMjoqOQ==,type:str]
lastmodified: "2025-10-07T15:22:47Z"
mac: ENC[AES256_GCM,data:HlXrcKW5MDzK6FulQuNtpNq7DkgZ+9lzjm71K8kaklE0i7rqPUh/Th3Scoy29ldA/6eSy4lPdo09h6hVKnIphhrMZuWsu+IbomKbB1tgCrY9LVBo3k0rWN719AVqNfY/f4eS59+ptNj1XBkcRujih7+mZ6Tynrh3rXVomk7ZBdc=,iv:J0AP+jbFMXRYk6cC9hdQTofhgdhBeeqCgfOdKh0KNKw=,tag:JiUg4GrJzMJue6HMaOxdtw==,type:str]
pgp:
- created_at: "2025-09-18T21:32:42Z"
enc: |-

View file

@ -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}";
};
};
};