diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 6b6ba7a..7549326 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -3,9 +3,7 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, ... }: -let - extIface = "ens3"; - ledgerVHost = "ledger.failco.de"; +let extIface = "ens3"; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -246,14 +244,12 @@ in { }; # hledger - "${ledgerVHost}" = { + "ledger.failco.de" = { forceSSL = true; enableACME = true; basicAuthFile = config.age.secrets.hledger-web.path; locations."/" = { - proxyPass = "http://${config.services.hledger-web.host}:${ - toString config.services.hledger-web.port - }/"; + proxyPass = "http://127.0.0.1:3003/"; proxyWebsockets = true; }; }; @@ -295,19 +291,6 @@ in { }; }; - services.hledger-web = { - enable = true; - baseUrl = "https://${ledgerVHost}"; - port = 3003; - capabilities = { - view = true; - add = true; - manage = true; - }; - journalFiles = [ "current.journal" ]; - extraOptions = [ "-B" "--value=then" ]; - }; - services.fail2ban = { enable = true; maxretry = 5; diff --git a/secrets/hledger-web.htaccess.age b/secrets/hledger-web.htaccess.age index c22f639..13337dc 100644 --- a/secrets/hledger-web.htaccess.age +++ b/secrets/hledger-web.htaccess.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> X25519 FrE3cLVPZshP6+VgS5aRSggS/3XEjLZW2/yCcxQT6z0 -xlPC1bF0NqiDVEk/xU+7GPGpwbTPZk+iSZ4QvvJzCcU --> ssh-ed25519 NCz+gA Ag6jD9h0FTR+jVR2K3wpQgGqyLJzQZyNvU2+AJPz+Xc -3QJhYsIl23/ve++5r9X/a2YUPSUgIBHJ8srPmeSnpKw --> BaPA]-grease A\OcT5| -L4Nk5eiaKq72ELBFQemUGlXJXpmUt5aN++g9ljz+DBG8XL3bQ9RbPMhbEy/gzKf6 -8WbY ---- hVjNjD1o1TI5B+CZqTdcoHjx3rRJCgrd4f13Vbhazmw -ؾt,AĬ[w3Lؒb`4?6 Ьޮժ1q?.'KjeidUdfeJJ=pŗ?o \ No newline at end of file +-> X25519 ntNFHjGdIlYJTbloT8Ujpn8Yh+oAaX/m0DHrq9ukLHQ +CTj9AefZLuZ0sBuFatp8/lEL8bUf2IXOHW00XJEdSVY +-> ssh-ed25519 NCz+gA kj420yScWjDD95LtvEb/62uXVzJU/v0ZSuJ+15MRdS8 +vFZNC94TxoXh1vVjHFPwPIV+nta5rWgdYWTokbBitxE +-> 9-grease %8XR5/t } +22U6Glc0+L2vlRnrx1Sd1g9b4sfpt/1d0ihfEk5ZQOgEcy45+eNmbHTLQHYzpkFo +PmIBJrRj07B93Pp1MR4sHmOMtK358D9l1LSURdWQtmtcocOoKdQWmPq+IQ +--- 1F50mU6ZhA2vbJq1Nkae6KWzxGY1DGdPNhlA6S3r2GM +FMѮL~:5v3 ߁d? l~:_ՄZDJR+" \ No newline at end of file