Upgrade nixpkgs

2 files changed, 42 insertions, 1 deletions

diff --git a/Biz/Cloud/Gmnisrv.nix b/Biz/Cloud/Gmnisrv.nix
new file mode 100644
index 0000000..c60d271
--- /dev/null
+++ b/Biz/Cloud/Gmnisrv.nix
@@ -0,0 +1,39 @@
+{ lib
+, config
+, pkgs
+, ...
+}:
+
+let
+  cfg = config.services.gmnisrv;
+in {
+  meta.maintainers = [ lib.maintainers.bsima ];
+  options.services.gmnisrv = {
+    enable = lib.mkEnableOption "Enable the gmnisrv service";
+    settings = lib.mkOption {
+      # type = cfgFormat.type;
+      description = ''
+        Configuration for gmnisrv. See gmnisrv.ini(5) for supported settings.
+      '';
+      default = {
+        "listen" = lib.mkDefault "0.0.0.0:1965 [::]:1965";
+        ":tls" = {
+          "store" = lib.mkDefault "${cfg.dataDir}/certs";
+        };
+      };
+    };
+    dataDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/gemini";
+      description = "Where gmnisrv should store certs and other data.";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    systemd.services.gmnisrv = {
+      description = "gmnisrv service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      script = "${pkgs.gmnisrv}/bin/gmnisrv -C ${lib.generators.toINI {} cfg.settings}";
+    };
+  };
+}
diff --git a/Biz/Cloud/Web.nix b/Biz/Cloud/Web.nix
index a096779..e0b9a95 100644
--- a/Biz/Cloud/Web.nix
+++ b/Biz/Cloud/Web.nix
@@ -1,10 +1,11 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 let
   rootDomain = config.networking.domain;
   ports = import ./Ports.nix;
 in
 {
+  imports = [  ./Gmnisrv.nix ];
   networking.firewall = {
     allowedTCPPorts = [
       ports.ssh
@@ -36,6 +37,7 @@ in
       };
     };
     gmnisrv = {
+      package = pkgs.gmnisrv;
       enable = true;
       settings = {
         listen = "0.0.0.0:${toString ports.gemini} [::]:${toString ports.gemini}";