diff --git a/aspects/hosts/_alexandria/freshrss.nix b/aspects/hosts/_alexandria/freshrss.nix new file mode 100644 index 0000000..b5880d5 --- /dev/null +++ b/aspects/hosts/_alexandria/freshrss.nix @@ -0,0 +1,34 @@ +{ + config, + lib, + inputs, + ... +}: + +let + mkNginxVHosts = inputs.self.lib.mkNginxVHosts; +in + +{ + services = { + freshrss = { + enable = true; + defaultUser = "admin"; + passwordFile = config.age.secrets.freshrss-adminpass.path; + baseUrl = "https://rss.baduhai.dev"; + dataDir = "/data/freshrss"; + webserver = "nginx"; + virtualHost = "rss.baduhai.dev"; + }; + + nginx.virtualHosts = mkNginxVHosts { + domains."rss.baduhai.dev" = { }; + }; + }; + + age.secrets.freshrss-adminpass = { + file = "${inputs.self}/secrets/freshrss-adminpass.age"; + owner = "freshrss"; + group = "freshrss"; + }; +} diff --git a/aspects/hosts/_alexandria/miniflux.nix b/aspects/hosts/_alexandria/miniflux.nix deleted file mode 100644 index 951bcb5..0000000 --- a/aspects/hosts/_alexandria/miniflux.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, inputs, ... }: - -let - mkNginxVHosts = inputs.self.lib.mkNginxVHosts; -in - -{ - services = { - miniflux = { - enable = true; - config = { - LISTEN_ADDR = "localhost:8080"; - CREATE_ADMIN = 1; - }; - adminCredentialsFile = config.age.secrets.miniflux-admincreds.path; - createDatabaseLocally = true; - }; - - nginx.virtualHosts = mkNginxVHosts { - domains."rss.baduhai.dev" = { - locations."/".proxyPass = "http://${config.services.miniflux.config.LISTEN_ADDR}/"; - }; - }; - }; - - age.secrets.miniflux-admincreds = { - file = "${inputs.self}/secrets/miniflux-admincreds.age"; - owner = "miniflux"; - group = "miniflux"; - }; -} diff --git a/data/services.nix b/data/services.nix index 9f04d89..b3eddf5 100644 --- a/data/services.nix +++ b/data/services.nix @@ -34,7 +34,7 @@ host = "alexandria"; } { - name = "miniflux"; + name = "freshrss"; domain = "rss.baduhai.dev"; host = "alexandria"; } diff --git a/secrets/freshrss-adminpass.age b/secrets/freshrss-adminpass.age new file mode 100644 index 0000000..b7d7c90 Binary files /dev/null and b/secrets/freshrss-adminpass.age differ diff --git a/secrets/miniflux-admincreds.age b/secrets/miniflux-admincreds.age deleted file mode 100644 index f5269f0..0000000 --- a/secrets/miniflux-admincreds.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Kfdnog QEq4A011oVny6vo1+wOcQNnpkf77216PZXJqK4rGTGY -FPeASmXRirxeF2T2jXhA/tEaO0p1CZJ6D3lv3p2KTX0 --> ssh-ed25519 8YSAiw gxuXAt2nG6qXhWwAAiFwNCNYJV2VGKnDNkjU61NOJ2o -xncp+M4lVixiTmXQU5QrtdQ860t/1JpvOcO4YXAy3to --> ssh-ed25519 J6tVTA Mr0XrEFP/o7nFWBKal+ehzMiejWpVDIBiiMqWzdOzEM -0DTqm2LyMMlVZlTk67Y3hTiVjcJG9gprnXj6QjYxrJw ---- FXUNp6O7vuibJj0RI3SZN3IBK1Hx5ouUij2ah05lCYA -X*0B3jb͏SVbBciD.5\`&`越-Ui"gХȊ`O Gc'=@qn[ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index d052896..277d880 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -32,7 +32,7 @@ in rotterdam-user trantor ]; - "miniflux-admincreds.age".publicKeys = [ + "freshrss-adminpass.age".publicKeys = [ io-user rotterdam-user alexandria