From 1cb4dd1813e39bb383cf23f452e49b1e108e1ea1 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Wed, 27 Sep 2023 16:38:33 +0100 Subject: [PATCH] Adding miniflux to kernighan --- system/kernighan/kernighan.nix | 1 + system/shared/services/miniflux.nix | 9 +++++++++ system/shared/services/nginx.nix | 20 +++++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 system/shared/services/miniflux.nix diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix index 94322e3..69ec90a 100644 --- a/system/kernighan/kernighan.nix +++ b/system/kernighan/kernighan.nix @@ -8,6 +8,7 @@ ./kernighan-hardware.nix ../shared/services/syncthing.nix ../shared/services/gitweb.nix + ../shared/services/miniflux.nix ../shared/services/nginx.nix ]; diff --git a/system/shared/services/miniflux.nix b/system/shared/services/miniflux.nix new file mode 100644 index 0000000..4b17157 --- /dev/null +++ b/system/shared/services/miniflux.nix @@ -0,0 +1,9 @@ +{ config, pkgs, inputs, ... }: + +{ + services.miniflux = { + enable = true; + adminCredentialsFile = "/home/tsv/.miniflux_admin_credentials"; + }; +} + diff --git a/system/shared/services/nginx.nix b/system/shared/services/nginx.nix index 89d29f7..737ae3c 100644 --- a/system/shared/services/nginx.nix +++ b/system/shared/services/nginx.nix @@ -4,15 +4,20 @@ services.nginx = { enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + gitweb = { enable = true; virtualHost = "git.tsvallender.co.uk"; location = "/home/tsv/git"; }; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; + virtualHosts."git.tsvallender.co.uk" = { + forceSSL = true; + enableACME = true; + }; virtualHosts."syncthing.tsvallender.co.uk" = { forceSSL = true; @@ -21,11 +26,16 @@ proxyPass = "http://127.0.0.1:8384"; }; }; - virtualHosts."git.tsvallender.co.uk" = { + + virtualHosts."feeds.tsvallender.co.uk" = { forceSSL = true; enableACME = true; + locations."/" = { + proxyPass = "http://127.0.0.1:8080"; + }; }; }; + security.acme = { acceptTerms = true; defaults = {