From 7a2f6147a2841f8fcfde2a7a4312c134e53ba639 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 25 Aug 2024 12:07:50 +0200 Subject: [PATCH] exposed jellyfin & cleaned some mess --- features/server/caddy.nix | 6 ++- features/server/default.nix | 2 +- features/server/multimedia/arr-suite.nix | 43 +++++++++---------- features/server/multimedia/jellyfin.nix | 1 + features/server/multimedia/slskd.nix | 4 +- features/server/multimedia/transmission.nix | 4 +- features/server/services/freshrss.nix | 10 ++--- features/server/services/grafana.nix | 1 - .../server/services/homelab-dashboard.nix | 9 ++-- features/server/services/i2p.nix | 7 --- features/server/services/uptime-kuma.nix | 1 - hosts/sisyphe/server-configuration.nix | 1 + 12 files changed, 39 insertions(+), 50 deletions(-) delete mode 100644 features/server/services/i2p.nix diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 101e08e..3562437 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -24,6 +24,10 @@ reverse_proxy :8096 ''; + "http://media.hypervirtual.world".extraConfig = '' + reverse_proxy :8096 + ''; + "http://slskd.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :5030 ''; @@ -48,7 +52,7 @@ reverse_proxy :3000 ''; - "http://status.normandy.hypervirtual.world".extraConfig = '' + "http://status.hypervirtual.world".extraConfig = '' reverse_proxy :4000 ''; diff --git a/features/server/default.nix b/features/server/default.nix index 519f317..0b54b2e 100644 --- a/features/server/default.nix +++ b/features/server/default.nix @@ -28,6 +28,6 @@ ethtool networkd-dispatcher transcrypt - libressl_3_8 + libressl_3_9 ]; } diff --git a/features/server/multimedia/arr-suite.nix b/features/server/multimedia/arr-suite.nix index af56b9f..d5e940c 100644 --- a/features/server/multimedia/arr-suite.nix +++ b/features/server/multimedia/arr-suite.nix @@ -1,10 +1,7 @@ { config, - pkgs, - lib, ... }: -with lib; let cfg = config.arrSuite; @@ -35,27 +32,27 @@ in enable = true; openFirewall = true; }; -/* - #TODO: create duplicated instances of Sonarr. - systemd.services."sonarrAnime" = { - enable = true; - description = "Duplicated Sonarr instance, for animes"; - after = [ - "syslog.target" - "network.target" - ]; + /* + #TODO: create duplicated instances of Sonarr. + systemd.services."sonarrAnime" = { + enable = true; + description = "Duplicated Sonarr instance, for animes"; + after = [ + "syslog.target" + "network.target" + ]; - path = [ pkgs.sonarr ]; - serviceConfig = { - Type = "simple"; - User = "sonarr"; - ExecStart = "${pkgs.sonarr}/bin/Sonarr -nobrowser -data=/var/lib/sonarrAnime"; - TimeoutStopSec = "20"; - KillMode = "process"; - Restart = "on-failure"; + path = [ pkgs.sonarr ]; + serviceConfig = { + Type = "simple"; + User = "sonarr"; + ExecStart = "${pkgs.sonarr}/bin/Sonarr -nobrowser -data=/var/lib/sonarrAnime"; + TimeoutStopSec = "20"; + KillMode = "process"; + Restart = "on-failure"; + }; + wantedBy = [ "multi-user.target" ]; }; - wantedBy = [ "multi-user.target" ]; - }; -*/ + */ } diff --git a/features/server/multimedia/jellyfin.nix b/features/server/multimedia/jellyfin.nix index 5024104..a2001bc 100644 --- a/features/server/multimedia/jellyfin.nix +++ b/features/server/multimedia/jellyfin.nix @@ -16,6 +16,7 @@ intel-media-sdk # QSV up to 11th gen ]; }; + services.jellyfin = { enable = true; openFirewall = true; diff --git a/features/server/multimedia/slskd.nix b/features/server/multimedia/slskd.nix index 3835aed..5dd3797 100644 --- a/features/server/multimedia/slskd.nix +++ b/features/server/multimedia/slskd.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.slskd; + cfg = config.downloads.music; in { options = { - slskd.directory = mkOption { + downloads.music.directory = mkOption { type = types.str; default = "/srv/media/Music"; }; diff --git a/features/server/multimedia/transmission.nix b/features/server/multimedia/transmission.nix index 18434b7..fdaf0cb 100644 --- a/features/server/multimedia/transmission.nix +++ b/features/server/multimedia/transmission.nix @@ -2,11 +2,11 @@ with lib; let - cfg = config.transmission; + cfg = config.downloads.transmission; in { options = { - transmission = { + downloads.transmission = { directory = mkOption { type = lib.types.str; default = "/srv/Multimedia"; diff --git a/features/server/services/freshrss.nix b/features/server/services/freshrss.nix index 3775a72..1987d24 100644 --- a/features/server/services/freshrss.nix +++ b/features/server/services/freshrss.nix @@ -14,18 +14,14 @@ in config = { sops.secrets = { - freshrss_username = { - sopsFile = ../../secrets/freshrss.yaml; - }; - freshrss_password = { - sopsFile = ../../secrets/freshrss.yaml; - }; + freshrss_username = { }; + freshrss_password = { }; }; services.freshrss = { enable = true; language = "fr"; - defaultUser = config.sops.secrets.freshrss_username; + defaultUser = ""; baseUrl = cfg.url; passwordFile = config.sops.secrets.freshrss_password.path; database = { diff --git a/features/server/services/grafana.nix b/features/server/services/grafana.nix index b07a949..98ca6aa 100644 --- a/features/server/services/grafana.nix +++ b/features/server/services/grafana.nix @@ -4,7 +4,6 @@ enable = true; settings = { server = { - http_addr = "0.0.0.0"; http_port = 3000; }; }; diff --git a/features/server/services/homelab-dashboard.nix b/features/server/services/homelab-dashboard.nix index 6d260f0..247520d 100644 --- a/features/server/services/homelab-dashboard.nix +++ b/features/server/services/homelab-dashboard.nix @@ -220,12 +220,11 @@ in { "Utilitaires" = [ { - "Photoprism" = { - icon = "photoprism"; - description = "Sauvegarde de photos"; - href = "http://${ip}:2342"; + "Nextcloud" = { + icon = "nextcloud"; + description = "Sauvegarde de données"; + href = "https://cloud.hypervirtual.world"; }; - } { "4get" = { diff --git a/features/server/services/i2p.nix b/features/server/services/i2p.nix deleted file mode 100644 index 8f5ca24..0000000 --- a/features/server/services/i2p.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: -{ - services.i2pd = { - enable = true; - upnp.enable = true; - }; -} diff --git a/features/server/services/uptime-kuma.nix b/features/server/services/uptime-kuma.nix index 7c6ab9f..c66d2ae 100644 --- a/features/server/services/uptime-kuma.nix +++ b/features/server/services/uptime-kuma.nix @@ -4,7 +4,6 @@ services.uptime-kuma = { enable = true; settings = { - HOST = "0.0.0.0"; PORT = "4000"; }; }; diff --git a/hosts/sisyphe/server-configuration.nix b/hosts/sisyphe/server-configuration.nix index c673d69..2361cae 100644 --- a/hosts/sisyphe/server-configuration.nix +++ b/hosts/sisyphe/server-configuration.nix @@ -36,6 +36,7 @@ in enable = true; allowedTCPPorts = [ 22 # ssh + 80 # http 8008 # matrix-synapse 8448 # matrix-synapse ];