From f9b36aee430721a843b695bf417bdcacef715bd9 Mon Sep 17 00:00:00 2001
From: Maciej Jur <maciej@kamoshi.org>
Date: Mon, 17 Jul 2023 15:42:00 +0200
Subject: [PATCH] Small fixes to FreshRSS config

---
 hosts/kamoshi/configuration.nix     | 3 +--
 hosts/kamoshi/profiles/freshrss.nix | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hosts/kamoshi/configuration.nix b/hosts/kamoshi/configuration.nix
index bdb8702..374e5fa 100644
--- a/hosts/kamoshi/configuration.nix
+++ b/hosts/kamoshi/configuration.nix
@@ -126,9 +126,8 @@
       recommendedProxySettings = true;
       virtualHosts = {
         "kamoshi.org" = {
-          default = true;
           root = "/var/www/kamoshi.org";
-          addSSL = true;
+          forceSSL = true;
           enableACME = true;
         };
       };
diff --git a/hosts/kamoshi/profiles/freshrss.nix b/hosts/kamoshi/profiles/freshrss.nix
index 9b04207..6a6373c 100644
--- a/hosts/kamoshi/profiles/freshrss.nix
+++ b/hosts/kamoshi/profiles/freshrss.nix
@@ -5,7 +5,10 @@ in
 {
   services = {
     freshrss = {
-      defaultUser = "kamov";
+      enable = true;
+      defaultUser = "admin";
+      # There's something wrong with this
+      # Workaround: https://github.com/FreshRSS/FreshRSS/issues/1082
       passwordFile = "/root/secrets/freshrss/password";
       baseUrl = "https://${address}";
       virtualHost = address;
@@ -14,7 +17,7 @@ in
     nginx = {
       enable = true;
       virtualHosts."${address}" = {
-        addSSL = true;
+        forceSSL = true;
         enableACME = true;
       };
     };