From 62c81b33376e64b357a8aad591b47523d99d1ace Mon Sep 17 00:00:00 2001 From: Ivan Reshetnikov Date: Wed, 23 Aug 2023 17:27:58 +0500 Subject: [PATCH] Add freshrss --- nixos/configuration.nix | 1 + nixos/programs/freshrss.nix | 16 ++++++++++++++++ nixos/programs/nginx.nix | 6 ++++++ nixos/programs/postgres.nix | 7 +++++-- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 nixos/programs/freshrss.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index dc24824..87225f7 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -22,6 +22,7 @@ ./programs/clickhouse.nix ./programs/docker.nix ./programs/microboard.nix + ./programs/freshrss.nix ]; # Enable flakes diff --git a/nixos/programs/freshrss.nix b/nixos/programs/freshrss.nix new file mode 100644 index 0000000..fa8ae3b --- /dev/null +++ b/nixos/programs/freshrss.nix @@ -0,0 +1,16 @@ +{ config, ... }: +{ + services.freshrss = { + enable = true; + database = { + type = "pgsql"; + host = "127.0.0.1"; + port = 5432; + passFile = "/var/lib/secrets/freshrss/dbpass.txt"; + }; + baseUrl = "https://freshrss.comfycamp.space"; + defaultUser = "lumin"; + passwordFile = "/var/lib/secrets/freshrss/password.txt"; + virtualHost = "freshrss.comfycamp.space"; + }; +} diff --git a/nixos/programs/nginx.nix b/nixos/programs/nginx.nix index eb9a45c..297ba85 100644 --- a/nixos/programs/nginx.nix +++ b/nixos/programs/nginx.nix @@ -115,6 +115,12 @@ in { }; }; + # Freshrss + "freshrss.comfycamp.space" = { + useACMEHost = "comfycamp.space"; + forceSSL = true; + }; + # Mastodon "m.comfycamp.space" = { useACMEHost = "comfycamp.space"; diff --git a/nixos/programs/postgres.nix b/nixos/programs/postgres.nix index 0ff3435..22fe5a6 100644 --- a/nixos/programs/postgres.nix +++ b/nixos/programs/postgres.nix @@ -73,8 +73,11 @@ superuser_map /^(.*)$ \1 ''; authentication = pkgs.lib.mkOverride 10 '' - #type database DBuser auth-method optional_ident_map - local sameuser all peer map=superuser_map + #type database DBuser auth-method optional_ident_map + local sameuser all peer map=superuser_map + + #type database DBuser origin-address auth-method + host all all 127.0.0.1/32 scram-sha-256 ''; }; }