diff --git a/hmModules/tremotesf/default.nix b/hmModules/tremotesf/default.nix index f1959c4..4078e06 100644 --- a/hmModules/tremotesf/default.nix +++ b/hmModules/tremotesf/default.nix @@ -16,10 +16,7 @@ }; Service = { - ExecStart = pkgs.writeShellScript "start-tremotesf.sh" '' - sleep 5 - ${lib.getExe pkgs.tremotesf} --minimized - ''; + ExecStart = "${lib.getExe' pkgs.coreutils "sleep"} 5 && ${lib.getExe pkgs.tremotesf} --minimized"; Restart = "on-failure"; RestartSec = 3; }; diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix index e1e01fb..4918ed7 100644 --- a/modules/paperless/default.nix +++ b/modules/paperless/default.nix @@ -22,17 +22,4 @@ environment.persistence."/persist".directories = [ config.services.paperless.dataDir ]; - - imports = [ ../nginx-base ]; - - services.nginx.virtualHosts."paper.aciceri.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString config.services.paperless.port}"; - }; - extraConfig = '' - client_max_body_size 50000M; - ''; - }; } diff --git a/modules/sisko-proxy/default.nix b/modules/sisko-proxy/default.nix index 353af1b..c6c1a7b 100644 --- a/modules/sisko-proxy/default.nix +++ b/modules/sisko-proxy/default.nix @@ -47,6 +47,13 @@ proxyWebsockets = true; }; }; + "paper.aciceri.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${builtins.toString config.services.paperless.port}"; + }; + }; # "${config.services.nextcloud.hostName}" = { # forceSSL = true; # enableACME = true;