From 1f0c2c55ab5c08109f61a4d5a470ec31f8884297 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 26 Aug 2024 10:11:13 +0200 Subject: [PATCH 1/5] added urls for all services --- features/server/caddy.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 3562437..5213df8 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -5,7 +5,7 @@ virtualHosts = { "http://sisyphe.normandy.hypervirtual.world".extraConfig = '' - reverse_proxy :8003 + reverse_proxy :8082 ''; "http://git.hypervirtual.world".extraConfig = '' @@ -56,8 +56,17 @@ reverse_proxy :4000 ''; - "http://transmission.normandy.hypervirtual.world".extraConfig = '' + "http://transmission.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :9091 + basicauth / {$USER} {$PASS} + ''; + + "http://uptime.sisyphe.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :4000 + ''; + + "http://mc.sisyphe.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :8443 ''; }; }; From 7b8838d9c6a1949ff795b6ec00df2aa2d39ad457 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 26 Aug 2024 10:12:44 +0200 Subject: [PATCH 2/5] unrecognized procedue --- features/server/caddy.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 5213df8..043a068 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -58,7 +58,6 @@ "http://transmission.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :9091 - basicauth / {$USER} {$PASS} ''; "http://uptime.sisyphe.normandy.hypervirtual.world".extraConfig = '' From 164ff07be1ee91bc118105973b96240a7cf05371 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 26 Aug 2024 10:36:21 +0200 Subject: [PATCH 3/5] moved urls --- features/server/caddy.nix | 8 +++++ .../server/services/homelab-dashboard.nix | 36 ++++++++++++------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 043a068..3c10620 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -67,6 +67,14 @@ "http://mc.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :8443 ''; + + "http://katflix.sisyphe.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :5055 + ''; + + "http://bazarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :6767 + ''; }; }; diff --git a/features/server/services/homelab-dashboard.nix b/features/server/services/homelab-dashboard.nix index ea89733..9783cd5 100644 --- a/features/server/services/homelab-dashboard.nix +++ b/features/server/services/homelab-dashboard.nix @@ -106,14 +106,14 @@ in "Calibre-web" = { icon = "calibre"; description = "Serveur de livres"; - href = "http://${ip}:5050"; + href = "http://books.hypervirtual.world"; }; } { "Freshrss" = { icon = "freshrss"; description = "Récupère les articles"; - + href = "http://freshrss.hypervirtual.world"; }; } ]; @@ -125,7 +125,7 @@ in "Jellyfin" = { icon = "jellyfin"; description = "Permet de regarder ou écouter du contenu."; - href = "http://${ip}:8096"; + href = "http://media.hypervirtual.world"; widget = { type = "jellyfin"; url = "http://${ip}:8096"; @@ -138,7 +138,7 @@ in "Jellyseerr" = { icon = "jellyseerr"; description = "Moteur de recherche de films/séries"; - href = "http://${ip}:5055"; + href = "http://katflix.sisyphe.normandy.hypervirtual.world"; widget = { type = "jellyseerr"; @@ -151,14 +151,14 @@ in "slskd" = { icon = "slskd"; description = "Pour télécharger/partager de la musique"; - href = "http://${ip}:5030"; + href = "http://slskd.sisyphe.normandy.hypervirtual.world"; }; } { "Prowlarr" = { icon = "prowlarr"; description = "Indexe les différents sites de téléchargement"; - href = "http://${ip}:9696/"; + href = "http://prowlarr.sisyphe.normandy.hypervirtual.world"; widget = { type = "prowlarr"; key = "{{HOMEPAGE_VAR_PROWLARR}}"; @@ -170,7 +170,7 @@ in "Sonarr" = { icon = "sonarr"; description = "Moteur de recherche pour les séries"; - href = "http://${ip}:8989/"; + href = "http://sonarr.sisyphe.normandy.hypervirtual.world"; widget = { type = "sonarr"; url = "http://${ip}:8989"; @@ -178,11 +178,23 @@ in }; }; } + { + "Sonarr anime" = { + icon = "sonarr"; + description = "Moteur de recherche pour les séries animées"; + href = "http://sonarr-anime.sisyphe.normandy.hypervirtual.world"; + widget = { + type = "sonarr"; + url = "http://${ip}:8999"; + key = "{{HOMEPAGE_VAR_SONARRANIME}}"; + }; + }; + } { "Radarr" = { icon = "radarr"; description = "Moteur de recherche pour les films"; - href = "http://${ip}:7878"; + href = "http://radarr.sisyphe.normandy.hypervirtual.world"; widget = { type = "radarr"; key = "{{HOMEPAGE_VAR_RADARR}}"; @@ -194,7 +206,7 @@ in "Bazarr" = { icon = "bazarr"; description = "Vérifie les sous titres des films/séries."; - href = "http://${ip}:6767"; + href = "http://bazarr.sisyphe.normandy.hypervirtual.world"; widget = { type = "bazarr"; key = "{{HOMEPAGE_VAR_BAZARR}}"; @@ -207,7 +219,7 @@ in "Transmission" = { icon = "transmission"; description = "s'occupe du téléchargement des fichiers"; - href = "http://${ip}:9091"; + href = "http://transmission.sisyphe.normandy.hypervirtual.world"; widget = { type = "transmission"; url = "http://${ip}:9091"; @@ -277,7 +289,7 @@ in "Grafana" = { icon = "grafana"; description = "Visualiseur de graphiques"; - href = "http://${ip}:3001"; + href = "http://grafana.sisyphe.normandy.hypervirtual.world"; }; } { @@ -291,7 +303,7 @@ in "Uptime Kuma" = { icon = "uptime-kuma"; description = "Surveille l'état des différents services"; - href = "http://${ip}:4001"; + href = "http://uptime.sisyphe.normandy.hypervirtual.world"; }; } { From 0aa7b0ba9e0a0284237dd416dce2524469ba60dd Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 26 Aug 2024 11:13:47 +0200 Subject: [PATCH 4/5] added bazarr anime support --- features/server/caddy.nix | 4 ++++ features/server/containers/sonarr.nix | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 3c10620..5b27bfb 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -75,6 +75,10 @@ "http://bazarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :6767 ''; + + "http://bazarr-anime.sisyphe.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :6777 + ''; }; }; diff --git a/features/server/containers/sonarr.nix b/features/server/containers/sonarr.nix index 9b424f4..116d279 100644 --- a/features/server/containers/sonarr.nix +++ b/features/server/containers/sonarr.nix @@ -5,7 +5,11 @@ containers = { sonarrAnime = { image = "lscr.io/linuxserver/sonarr:latest"; - volumes = [ "sonarr_data:/config" "/srv/Multimedia/DessinsAnime:/tv" "/srv/Multimedia/Torrents:/srv/Multimedia/Torrents" ]; + volumes = [ + "sonarr_data:/config" + "/srv/Multimedia/DessinsAnime:/tv" + "/srv/Multimedia/Torrents:/srv/Multimedia/Torrents" + ]; ports = [ "8999:8989" ]; environment = { "PUID" = "1000"; @@ -13,6 +17,20 @@ "TZ" = "Europe/Paris"; }; }; + + bazarrAnime = { + image = "lscr.io/linuxserver/bazarr:latest"; + volumes = [ + "bazarr_data:/config" + "/srv/Multimedia/DessinsAnime:/tv" + ]; + ports = [ "6777:6777" ]; + environment = { + "PUID" = "1000"; + "GUID" = "1000"; + "TZ" = "Europe/Paris"; + }; + }; }; }; } From 24c5ab3eea8ecb4a5de2840388ebf732338203ba Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 26 Aug 2024 11:26:27 +0200 Subject: [PATCH 5/5] (bug): fixed port --- features/server/containers/sonarr.nix | 2 +- features/server/services/homelab-dashboard.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/features/server/containers/sonarr.nix b/features/server/containers/sonarr.nix index 116d279..3098639 100644 --- a/features/server/containers/sonarr.nix +++ b/features/server/containers/sonarr.nix @@ -24,7 +24,7 @@ "bazarr_data:/config" "/srv/Multimedia/DessinsAnime:/tv" ]; - ports = [ "6777:6777" ]; + ports = [ "6777:6767" ]; environment = { "PUID" = "1000"; "GUID" = "1000"; diff --git a/features/server/services/homelab-dashboard.nix b/features/server/services/homelab-dashboard.nix index 9783cd5..8aa225f 100644 --- a/features/server/services/homelab-dashboard.nix +++ b/features/server/services/homelab-dashboard.nix @@ -214,6 +214,19 @@ in }; }; } + { + "Bazarr anime" = { + icon = "bazarr"; + description = "Vérifie les sous titres des séries animées."; + href = "http://bazarr-anime.sisyphe.normandy.hypervirtual.world"; + widget = { + type = "bazarr"; + key = "{{HOMEPAGE_VAR_BAZARRANIME}}"; + url = "http://${ip}:6768"; + }; + + }; + } { "Transmission" = {