From 4a0ba5f3e38a47fc4542ce2392c70fd8d77c1ba1 Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <mcsinyx@disroot.org>
Date: Sat, 17 Jun 2023 00:36:45 +0900
Subject: Update for latest unstable

ntfy was debugged by xarvos.

Fixes: https://github.com/NixOS/nixpkgs/pull/234811
---
 configuration.nix |  2 +-
 push.nix          | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 5f94597..cdda865 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -54,7 +54,7 @@
   services.openssh = {
     enable = true;
     openFirewall = true;
-    settings.passwordAuthentication = false;
+    settings.PasswordAuthentication = false;
     ports = [ 2211 ];
   };
 
diff --git a/push.nix b/push.nix
index 235cbcd..a6111c0 100644
--- a/push.nix
+++ b/push.nix
@@ -17,19 +17,25 @@
 # along with loang configuration.  If not, see <https://www.gnu.org/licenses/>.
 
 { config, ... }:
-let address = "localhost:21840";
+let domain = "tin.${config.networking.domain}";
 in {
   services = {
     ntfy-sh = {
       enable = true;
-      settings.listen-http = address;
+      settings = {
+        base-url = "https://${domain}";
+        # Cannot write to log for some reason,
+        # TODO: Ask on their forum about that
+        # log-level = "info";
+        # log-file = "/var/log/ntfy-sh/ntfy.log";
+      };
     };
 
-    nginx.virtualHosts."tin.${config.networking.domain}" = {
+    nginx.virtualHosts."${domain}" = {
       enableACME = true;
       forceSSL = true;
       locations."/" = {
-        proxyPass = "http://${address}";
+        proxyPass = "http://${config.services.ntfy-sh.settings.listen-http}";
         proxyWebsockets = true;
       };
     };
-- 
cgit 1.4.1