diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix index 38e827b4..23901f79 100644 --- a/hosts/nixos/porthos/services.nix +++ b/hosts/nixos/porthos/services.nix @@ -127,6 +127,14 @@ in passwordFile = secrets."paperless/password".path; secretKeyFile = secrets."paperless/secret-key".path; }; + # The whole *arr software suite + pirate = { + enable = true; + # ... But not Lidarr because I don't care for music that much + lidarr = { + enable = false; + }; + }; # Podcast automatic downloader podgrab = { enable = true; @@ -144,14 +152,6 @@ in rss-bridge.enable = true; # Usenet client sabnzbd.enable = true; - # The whole *arr software suite - servarr = { - enable = true; - # ... But not Lidarr because I don't care for music that much - lidarr = { - enable = false; - }; - }; # Because I stilll need to play sysadmin ssh-server.enable = true; # Recipe manager diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index e877c8f0..60b24786 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -26,6 +26,7 @@ ./nginx ./nix-cache ./paperless + ./pirate ./podgrab ./postgresql ./postgresql-backup @@ -33,7 +34,6 @@ ./quassel ./rss-bridge ./sabnzbd - ./servarr ./ssh-server ./tandoor-recipes ./tlp diff --git a/modules/nixos/services/nginx/sso/default.nix b/modules/nixos/services/nginx/sso/default.nix index d60e31b4..4a78282a 100644 --- a/modules/nixos/services/nginx/sso/default.nix +++ b/modules/nixos/services/nginx/sso/default.nix @@ -59,10 +59,15 @@ in StateDirectory = "nginx-sso"; WorkingDirectory = "/var/lib/nginx-sso"; # The files to be merged might not have the correct permissions - ExecStartPre = pkgs.writeShellScript "merge-nginx-sso-config" '' + ExecStartPre = ''+${pkgs.writeShellScript "merge-nginx-sso-config" '' rm -f '${confPath}' ${utils.genJqSecretsReplacementSnippet cfg.configuration confPath} - ''; + + # Fix permissions + chown nginx-sso:nginx-sso ${confPath} + chmod 0600 ${confPath} + '' + }''; ExecStart = lib.mkForce '' ${lib.getExe pkg} \ --config ${confPath} \ diff --git a/modules/nixos/services/servarr/default.nix b/modules/nixos/services/pirate/default.nix similarity index 88% rename from modules/nixos/services/servarr/default.nix rename to modules/nixos/services/pirate/default.nix index e25d9cfd..e500b544 100644 --- a/modules/nixos/services/servarr/default.nix +++ b/modules/nixos/services/pirate/default.nix @@ -4,13 +4,12 @@ # [1]: https://youtu.be/I26Ql-uX6AM { config, lib, ... }: let - cfg = config.my.services.servarr; + cfg = config.my.services.pirate; ports = { bazarr = 6767; lidarr = 8686; radarr = 7878; - readarr = 8787; sonarr = 8989; }; @@ -53,7 +52,7 @@ let ]); in { - options.my.services.servarr = { + options.my.services.pirate = { enable = lib.mkEnableOption "Media automation"; bazarr = { @@ -68,10 +67,6 @@ in enable = lib.my.mkDisableOption "Radarr"; }; - readarr = { - enable = lib.my.mkDisableOption "Readarr"; - }; - sonarr = { enable = lib.my.mkDisableOption "Sonarr"; }; @@ -90,9 +85,6 @@ in # Radarr for movies (mkFullConfig "radarr") (mkFail2Ban "radarr") - # Readarr for books - (mkFullConfig "readarr") - (mkFail2Ban "readarr") # Sonarr for shows (mkFullConfig "sonarr") (mkFail2Ban "sonarr") diff --git a/overlays/downgrade-transmission/default.nix b/overlays/downgrade-transmission/default.nix deleted file mode 100644 index 9d3fc8ae..00000000 --- a/overlays/downgrade-transmission/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -self: prev: -{ - transmission_4 = prev.transmission_4.overrideAttrs (_: { - version = "4.0.5"; - - src = self.fetchFromGitHub { - owner = "transmission"; - repo = "transmission"; - rev = "4.0.5"; - hash = "sha256-gd1LGAhMuSyC/19wxkoE2mqVozjGPfupIPGojKY0Hn4="; - fetchSubmodules = true; - }; - }); -}