diff --git a/machines/elrond/routes.nix b/machines/elrond/routes.nix index 3586ebf..22586b2 100644 --- a/machines/elrond/routes.nix +++ b/machines/elrond/routes.nix @@ -49,25 +49,30 @@ proxyPass = "http://100.84.215.84:4242"; }; basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; - - - - - -virtualHosts."minecraft.256.no" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://100.84.215.84:25565"; - extraConfig = '' - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - ''; - }; -}; + }; + virtualHosts."freshrss.lauterer.it" = { + forceSSL = true; + useACMEHost = config.networking.domain; + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://100.84.215.84:80"; + }; + basicAuthFile = config.sops.secrets."nginx/defaultpass".path; + }; + + virtualHosts."minecraft.256.no" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "100.84.215.84:25565"; + extraConfig = '' + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + }; }; diff --git a/machines/galadriel/configuration.nix b/machines/galadriel/configuration.nix index b27093d..56d426f 100644 --- a/machines/galadriel/configuration.nix +++ b/machines/galadriel/configuration.nix @@ -22,7 +22,7 @@ ../../services/torrent.nix ../../services/mc.nix #../../services/stableDiffusion.nix - #../../services/freshrrs.nix + ../../services/freshrrs.nix ]; # Bootloader. diff --git a/packages/podgrab/default.nix b/packages/podgrab/default.nix new file mode 100644 index 0000000..820b0fb --- /dev/null +++ b/packages/podgrab/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: + +buildGoModule rec { + pname = "podgrab"; + version = "unstable-2022-09-20"; + + src = fetchFromGitHub { + owner = "akhilrex"; + repo = pname; + rev = "44e2b1c207288bb8a84ecb64424e0a501fa02510"; + sha256 = ""; + }; + + vendorHash = "sha256-xY9xNuJhkWPgtqA/FBVIp7GuWOv+3nrz6l3vaZVLlIE="; + + postInstall = '' + mkdir -p $out/share/ + cp -r $src/client $out/share/ + cp -r $src/webassets $out/share/ + ''; + + passthru.tests = { inherit (nixosTests) podgrab; }; + + meta = with lib; { + description = "A self-hosted podcast manager to download episodes as soon as they become live"; + mainProgram = "podgrab"; + homepage = "https://github.com/akhilrex/podgrab"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +}