diff --git a/aspects/hosts/_alexandria/linkwarden.nix b/aspects/hosts/_alexandria/linkwarden.nix deleted file mode 100644 index 31066b3..0000000 --- a/aspects/hosts/_alexandria/linkwarden.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - inputs, - ... -}: - -let - mkNginxVHosts = inputs.self.lib.mkNginxVHosts; -in - -{ - services = { - linkwarden = { - enable = true; - host = "127.0.0.1"; - port = 58223; - enableRegistration = true; - secretFiles.NEXTAUTH_SECRET = config.age.secrets.linkwarden-nextauth-secret.path; - environment = { - NEXTAUTH_URL = "https://read.baduhai.dev"; - }; - }; - - nginx.virtualHosts = mkNginxVHosts { - domains."read.baduhai.dev".locations."/".proxyPass = - "http://${config.services.linkwarden.host}:${toString config.services.linkwarden.port}/"; - }; - }; - - age.secrets.linkwarden-nextauth-secret = { - file = "${inputs.self}/secrets/linkwarden-nextauth-secret.age"; - owner = "linkwarden"; - group = "linkwarden"; - }; -} diff --git a/aspects/hosts/_alexandria/miniflux.nix b/aspects/hosts/_alexandria/miniflux.nix deleted file mode 100644 index a1f3ca3..0000000 --- a/aspects/hosts/_alexandria/miniflux.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, inputs, ... }: - -let - mkNginxVHosts = inputs.self.lib.mkNginxVHosts; -in - -{ - services = { - miniflux = { - enable = true; - config = { - LISTEN_ADDR = "localhost:8080"; - CREATE_ADMIN = 1; - FETCHER_ALLOW_PRIVATE_NETWORKS = 1; - POLLING_SCHEDULER = "entry_frequency"; - SCHEDULER_ENTRY_FREQUENCY_MIN_INTERVAL = 60; - SCHEDULER_ENTRY_FREQUENCY_MAX_INTERVAL = 10080; - }; - 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/aspects/hosts/_alexandria/ttrss.nix b/aspects/hosts/_alexandria/ttrss.nix new file mode 100644 index 0000000..ba03c21 --- /dev/null +++ b/aspects/hosts/_alexandria/ttrss.nix @@ -0,0 +1,39 @@ +{ + config, + inputs, + ... +}: + +let + mkNginxVHosts = inputs.self.lib.mkNginxVHosts; +in + +{ + services = { + "tt-rss" = { + enable = true; + selfUrlPath = "https://rss.baduhai.dev"; + singleUserMode = true; + virtualHost = null; + database.createLocally = true; + }; + + nginx.virtualHosts = mkNginxVHosts { + domains."rss.baduhai.dev" = { + root = "${config.services."tt-rss".root}/www"; + + locations."/".index = "index.php"; + + locations."~* /feed-icons/(\\d+)\\.ico".return = "302 /public.php?op=feed_icon&id=$1"; + + locations."~ \\.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${config.services."tt-rss".pool}.socket}; + fastcgi_index index.php; + ''; + }; + }; + }; + }; +} diff --git a/data/services.nix b/data/services.nix index 7e64bd0..0ebf8e7 100644 --- a/data/services.nix +++ b/data/services.nix @@ -34,14 +34,9 @@ host = "alexandria"; } { - name = "miniflux"; + name = "tt-rss"; domain = "rss.baduhai.dev"; host = "alexandria"; } - { - name = "linkwarden"; - domain = "read.baduhai.dev"; - host = "alexandria"; - } ]; } diff --git a/secrets/linkwarden-nextauth-secret.age b/secrets/linkwarden-nextauth-secret.age deleted file mode 100644 index 16b777f..0000000 --- a/secrets/linkwarden-nextauth-secret.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Kfdnog 6zG/NjBl7vB4HYBmLNGR9M6G+c6B8OsmYLJj86wheww -dh2XJG06yymKwMNnYKNdXSG5aVhOnzyFTSzsJN4TAXU --> ssh-ed25519 8YSAiw T8NbnvYtBSWzx3MaVsca5vZbjIc8qYOb8BkkwQQ1SU0 -5xg2ix2uk4TUOmE2+N6DJzzdPF3Sx+lWwkeCVO7UGqU --> ssh-ed25519 J6tVTA anq6h4C7i86EkPZsjRCFCl5Gie9NAU0UjIRpatZ2Kx8 -Jz9WXhPjLdwrpm4gOVRYHxO/+EjZLPQRY5rJG4zoeDA ---- Zy+2VeF7qv5z1lLpfFQw4nAIsMiW/pIsyEyK/vY/Nag -2{pn({91 )Ĺȯ#FELb -ae1J27N,5G6s \ No newline at end of file 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 19d01cf..a90cd74 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -32,14 +32,4 @@ in rotterdam-user trantor ]; - "miniflux-admincreds.age".publicKeys = [ - io-user - rotterdam-user - alexandria - ]; - "linkwarden-nextauth-secret.age".publicKeys = [ - io-user - rotterdam-user - alexandria - ]; }