colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

slskd: fix that the nixos module unconditionall enables nginx

This commit is contained in:
Colin 2023-11-28 13:57:52 +00:00
parent 3c3fe16569
commit 8fc5e3611e
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hosts/by-name/servo/services/slskd.nix
View File

@ -24,8 +24,7 @@
sane.dns.zones."uninsane.org".inet.CNAME."soulseek" = "native";
# slskd unconditionally manages nginx for me.
services.nginx.virtualHosts."soulseek.uninsane.org" = lib.mkForce {
services.nginx.virtualHosts."soulseek.uninsane.org" = {
forceSSL = true;
enableACME = true;
locations."/" = {
@ -63,14 +62,6 @@
# flags.volatile = true; # store searches and active transfers in RAM (completed transfers still go to disk). rec for btrfs/zfs
};
services.slskd.nginx = {
# NOTE: i override these settings elsewhere.
# slskd offers no option to disable nginx integration, for now.
# but because of the netns, its default config isn't usable for me.
domainName = "soulseek.uninsane.org";
contextPath = "/";
};
systemd.services.slskd = {
serviceConfig = {
# run this behind the OVPN static VPN

9
nixpatches/list.nix
View File

@ -29,10 +29,17 @@ in [
hash = "sha256-Kqqfy9Mludc5wr0TSUg9gEOZsfUL65WpF+hy64k33MY=";
})
(fetchpatch' {
title = "slskd: allow omitting username from yaml config";
# out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
title = "nixos/slskd: allow omitting username from yaml config";
saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
hash = "sha256-xQEj/oIfNcE4td9jxzDzhlnIYpncOOdXZuswkmcLNuk=";
})
(fetchpatch' {
# out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
title = "nixos/slskd: don't enable nginx unless nginx.enable was set";
saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
})
(fetchpatch' {
title = "vala: look for files in targetOffset";
prUrl = "https://github.com/NixOS/nixpkgs/pull/267550";