mirror of
https://github.com/JulienMalka/snowfield.git
synced 2025-06-08 10:09:04 +02:00
minor code cleaning
This commit is contained in:
parent
fe8bd69ebe
commit
44b3f14d48
9 changed files with 32 additions and 74 deletions
|
@ -39,8 +39,7 @@ in
|
|||
|
||||
services.deluge = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
inherit (cfg) user group;
|
||||
openFirewall = true;
|
||||
declarative = true;
|
||||
authFile = "/run/secrets/deluge";
|
||||
|
@ -55,9 +54,9 @@ in
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -18,9 +18,9 @@ in
|
|||
mkMerge [{
|
||||
|
||||
services.hydra = {
|
||||
inherit port;
|
||||
enable = true;
|
||||
notificationSender = "hydra@localhost";
|
||||
inherit port;
|
||||
buildMachinesFiles = [ ];
|
||||
useSubstitutes = true;
|
||||
};
|
||||
|
@ -28,9 +28,11 @@ in
|
|||
networking.firewall = { allowedTCPPorts = [ port ]; };
|
||||
}
|
||||
|
||||
(mkIf cfg.nginx.enable (recursiveUpdate {
|
||||
services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
|
||||
} (mkSubdomain cfg.nginx.subdomain port)) )]);
|
||||
(mkIf cfg.nginx.enable (recursiveUpdate
|
||||
{
|
||||
services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
|
||||
}
|
||||
(mkSubdomain cfg.nginx.subdomain port)))]);
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -32,14 +32,14 @@ in
|
|||
mkMerge [{
|
||||
services.jackett = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
package = pkgs.unstable.jackett;
|
||||
inherit (cfg) user group;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -32,47 +32,16 @@ in
|
|||
mkMerge [{
|
||||
services.jellyfin = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
inherit (cfg) user group;
|
||||
};
|
||||
|
||||
# services.nginx.appendHttpConfig = ''
|
||||
# server {
|
||||
# server_name tv.julienmalka.me;
|
||||
# listen 80;
|
||||
# return 301 https://$server_name$request_uri;
|
||||
# }
|
||||
|
||||
# server {
|
||||
# server_name tv.julienmalka.me;
|
||||
# listen 443 ssl http2;
|
||||
|
||||
# include ${../authelia/authelia.conf}; # Authelia auth endpoint
|
||||
|
||||
# location / {
|
||||
# proxy_pass http://127.0.0.1:8096;
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
||||
# include ${../authelia/secure.conf}; # Protect this endpoint
|
||||
# }
|
||||
# }
|
||||
# '';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))
|
||||
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))
|
||||
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -33,14 +33,13 @@ in
|
|||
mkMerge [{
|
||||
services.lidarr = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
inherit (cfg) user group;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -33,13 +33,13 @@ in
|
|||
mkMerge [{
|
||||
services.radarr = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
package = pkgs.unstable.radarr;
|
||||
inherit (cfg) user group;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
(mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -33,8 +33,7 @@ in
|
|||
mkMerge [{
|
||||
services.sonarr = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
inherit (cfg) user group;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ in
|
|||
|
||||
services.transmission = {
|
||||
enable = true;
|
||||
inherit (cfg) user;
|
||||
inherit (cfg) group;
|
||||
inherit (cfg) user group;
|
||||
credentialsFile = "/run/secrets/transmission";
|
||||
downloadDirPermissions = "770";
|
||||
settings = {
|
||||
|
@ -52,7 +51,7 @@ in
|
|||
};
|
||||
}
|
||||
|
||||
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port) )]);
|
||||
(mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))]);
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue