From 62a01d2c03967e53ff91dd52967795164f88bca8 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Mon, 15 Apr 2024 12:01:22 -0700
Subject: [PATCH] fix(access): mistakes

---
 modules/nixos/nginx/ssl.nix | 6 +++---
 nixos/access/freeipa.nix    | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/nixos/nginx/ssl.nix b/modules/nixos/nginx/ssl.nix
index ea82bdc1..d40f7c26 100644
--- a/modules/nixos/nginx/ssl.nix
+++ b/modules/nixos/nginx/ssl.nix
@@ -4,7 +4,7 @@
   inputs,
   ...
 }: let
-  inherit (inputs.self.lib.lib) mkAlmostOptionDefault;
+  inherit (inputs.self.lib.lib) mkAlmostOptionDefault mkAlmostDefault;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
   inherit (lib.attrsets) mapAttrsToList;
@@ -131,8 +131,8 @@
       ssl.cert = let
         cert = nixosConfig.security.acme.certs.${cfg.cert.name};
       in {
-        path = mkIf (cfg.cert.name != null) (mkAlmostOptionDefault "${cert.directory}/fullchain.pem");
-        keyPath = mkIf (cfg.cert.name != null) (mkAlmostOptionDefault "${cert.directory}/key.pem");
+        path = mkIf (cfg.cert.name != null) (mkAlmostDefault "${cert.directory}/fullchain.pem");
+        keyPath = mkIf (cfg.cert.name != null) (mkAlmostDefault "${cert.directory}/key.pem");
       };
       #listen.ssl = mkIf cfg.enable { ssl = true; };
       extraConfig = mkMerge [
diff --git a/nixos/access/freeipa.nix b/nixos/access/freeipa.nix
index 55b7dc5c..80547326 100644
--- a/nixos/access/freeipa.nix
+++ b/nixos/access/freeipa.nix
@@ -2,9 +2,11 @@
   config,
   meta,
   lib,
+  gensokyo-zone,
   ...
 }:
 let
+  inherit (gensokyo-zone.lib) mkAddress6;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.modules) mkIf mkMerge mkBefore mkDefault mkOptionDefault;
   inherit (lib.strings) optionalString concatStringsSep;
@@ -99,7 +101,7 @@ in {
       type = str;
       default = let
         scheme = if access.port == 443 then "https" else "http";
-      in "${scheme}://${access.host}:${toString access.port}";
+      in "${scheme}://${mkAddress6 access.host}:${toString access.port}";
     };
     port = mkOption {
       type = port;