diff --git a/hosts/elisabeth/secrets/ttrss/generated/freshrsspasswd.age b/hosts/elisabeth/secrets/ttrss/generated/freshrsspasswd.age new file mode 100644 index 0000000..18f75d3 --- /dev/null +++ b/hosts/elisabeth/secrets/ttrss/generated/freshrsspasswd.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> X25519 KeayMdkWoIyLZu47yQdC+NKUeBli7y/KhyFrbvQKMjo +RFNC0waSc89REZ+uRWTYyKYcM0oW9Q8m92buzX9OlaY +-> piv-p256 XTQkUA Aqrx2ok2XeZvJWsPvOi7o7T3/PvZcZ5naOEvSouqGDxt +PW6G4aqvzq4JoJecPp7bP4Rzc6rgAV4NaTfeRCF5OYA +-> piv-p256 ZFgiIw A7pQOh63jVeS6WHnWusY2FuLk8ezS/lu6h+LmTqgArA3 +4IkRO5JXgBggCYSI0lOaccyqVmHupOiFqZZwHsdlBDc +-> piv-p256 5vmPtQ A7kRH2YuvwTE+wCqpvE8FBlHthHv8cMWVLQOWxbKbgHq +OudUFhREd4J2cQQG9eEeKIjAqHkp+XznKFpvsJjgEHk +-> piv-p256 ZFgiIw AsojcZKNzLUdTgOekkqwisrOy7t8hup9sVla7PbL1RKH +cpG56veIp+cpW9JXsK2/4NXQ7kJM7g1Hg/sEnFSuW8k +-> ~yTrd-grease ox]5\ *89S8!# +Bfh0HDXNORM8GT6noqoh2KcVvUOksp09VOfG/dUFCC4DUUo +--- EJSmnzU8XIhaFIkPRjyFZxi+kEHap903mrUuc2MpUkY +sl3ip}ܨd*mE =FC}J2ɽpMv,spD]L3 \ No newline at end of file diff --git a/modules/config/users.nix b/modules/config/users.nix index a7f9d56..f916024 100644 --- a/modules/config/users.nix +++ b/modules/config/users.nix @@ -27,6 +27,7 @@ microvm = uidGid 217; maddy = uidGid 218; tt_rss = uidGid 219; + freshrss = uidGid 220; paperless = uidGid 315; systemd-oom = uidGid 300; systemd-coredump = uidGid 301; diff --git a/modules/services/ttrss.nix b/modules/services/ttrss.nix index ec93a78..407f9ba 100644 --- a/modules/services/ttrss.nix +++ b/modules/services/ttrss.nix @@ -1,33 +1,21 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { + age.secrets.freshrsspasswd = { + generator.script = "alnum"; + owner = config.services.freshrss.user; + }; networking.firewall.allowedTCPPorts = [80]; - services.tt-rss = { + services.freshrss = { enable = true; - logDestination = "syslog"; - selfUrlPath = "https://rss.lel.lol"; + passwordFile = config.age.secrets.freshrsspasswd.path; + defaultUser = "patrick"; + baseUrl = "https://rss.lel.lol"; virtualHost = "rss.lel.lol"; - themePackages = [ - pkgs.tt-rss-theme-feedly - ]; - auth = { - autoLogin = false; - autoCreate = false; - }; }; environment.persistence."/persist".directories = [ { - directory = "/var/lib/postgresql/"; - user = "postgres"; - group = "postgres"; - mode = "750"; - } - { - inherit (config.services.tt-rss) user; - directory = config.services.tt-rss.root; - group = config.services.tt-rss.user; + inherit (config.services.freshrss) user; + directory = config.services.freshrss.dataDir; + group = config.services.freshrss.user; mode = "0750"; } ];