nix/module.nix

@@ -8,13 +8,18 @@ let
   cfg = config.services.ugit;
   pkg = pkgs.callPackage ./pkg.nix { inherit pkgs; };
   yamlFormat = pkgs.formats.yaml { };
-  instanceOptions =
+  configFile = pkgs.writeText "ugit.yaml" (
-    { name, config, ... }:
+    builtins.readFile (yamlFormat.generate "ugit-yaml" cfg.config)
+  );
+  authorizedKeysFile = pkgs.writeText "ugit_keys" (builtins.concatStringsSep "\n" cfg.authorizedKeys);
+in
+{
+  options =
     let
       inherit (lib) mkEnableOption mkOption types;
     in
     {
-      options = {
+      services.ugit = {
         enable = mkEnableOption "Enable ugit";
 
         package = mkOption {
@@ -23,16 +28,10 @@ let
           default = pkg;
         };
 
-        homeDir = mkOption {
-          type = types.str;
-          description = "ugit home directory";
-          default = "/var/lib/ugit/${name}";
-        };
-
         repoDir = mkOption {
           type = types.str;
           description = "where ugit stores repositories";
-          default = "/var/lib/ugit/${name}/repos";
+          default = "/var/lib/ugit/repos";
         };
 
         authorizedKeys = mkOption {
@@ -44,13 +43,13 @@ let
         authorizedKeysFile = mkOption {
           type = types.str;
           description = "path to authorized_keys file ugit uses for auth";
-          default = "/var/lib/ugit/${name}/authorized_keys";
+          default = "/var/lib/ugit/authorized_keys";
         };
 
         hostKeyFile = mkOption {
           type = types.str;
           description = "path to host key file (will be created if it doesn't exist)";
-          default = "/var/lib/ugit/${name}/ugit_ed25519";
+          default = "/var/lib/ugit/ugit_ed25519";
         };
 
         config = mkOption {
@@ -61,16 +60,21 @@ let
 
         user = mkOption {
           type = types.str;
-          default = "ugit-${name}";
+          default = "ugit";
           description = "User account under which ugit runs";
         };
 
         group = mkOption {
           type = types.str;
-          default = "ugit-${name}";
+          default = "ugit";
           description = "Group account under which ugit runs";
         };
 
+        openFirewall = mkOption {
+          type = types.bool;
+          default = false;
+        };
+
         hooks = mkOption {
           type = types.listOf (
             types.submodule {
@@ -91,120 +95,85 @@ let
         };
       };
     };
-in
+  config = lib.mkIf cfg.enable {
-{
+    users.users."${cfg.user}" = {
-  options = {
+      home = "/var/lib/ugit";
-    services.ugit = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule instanceOptions);
-      default = { };
-      description = "Attribute set of ugit instances";
-    };
-  };
-  config = lib.mkIf (cfg != { }) {
-    users.users = lib.mapAttrs' (
-      name: instanceCfg:
-      lib.nameValuePair instanceCfg.user {
-        home = instanceCfg.homeDir;
       createHome = true;
-        group = instanceCfg.group;
+      group = "${cfg.group}";
       isSystemUser = true;
       isNormalUser = false;
-        description = "user for ugit ${name} service";
+      description = "user for ugit service";
-      }
+    };
-    ) (lib.filterAttrs (name: instanceCfg: instanceCfg.enable) cfg);
+    users.groups."${cfg.group}" = { };
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [
+        8448
+        8449
+      ];
+    };
 
-    users.groups = lib.mapAttrs' (name: instanceCfg: lib.nameValuePair instanceCfg.group { }) (
+    systemd.services = {
-      lib.filterAttrs (name: instanceCfg: instanceCfg.enable) cfg
+      ugit = {
-    );
-
-    systemd.services = lib.foldl' (
-      acc: name:
-      let
-        instanceCfg = cfg.${name};
-      in
-      lib.recursiveUpdate acc (
-        lib.optionalAttrs instanceCfg.enable {
-          "ugit-${name}" = {
         enable = true;
-            description = "ugit instance ${name}";
+        script =
+          let
+            authorizedKeysPath =
+              if (builtins.length cfg.authorizedKeys) > 0 then authorizedKeysFile else cfg.authorizedKeysFile;
+            args = [
+              "--config=${configFile}"
+              "--repo-dir=${cfg.repoDir}"
+              "--ssh.authorized-keys=${authorizedKeysPath}"
+              "--ssh.host-key=${cfg.hostKeyFile}"
+            ];
+          in
+          "${cfg.package}/bin/ugitd ${builtins.concatStringsSep " " args}";
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         path = [
-              instanceCfg.package
+          cfg.package
           pkgs.git
           pkgs.bash
         ];
         serviceConfig = {
-              User = instanceCfg.user;
+          User = cfg.user;
-              Group = instanceCfg.group;
+          Group = cfg.group;
           Restart = "always";
           RestartSec = "15";
-              WorkingDirectory = instanceCfg.homeDir;
+          WorkingDirectory = "/var/lib/ugit";
-              ExecStart =
-                let
-                  configFile = pkgs.writeText "ugit-${name}.yaml" (
-                    builtins.readFile (yamlFormat.generate "ugit-${name}-yaml" instanceCfg.config)
-                  );
-                  authorizedKeysFile = pkgs.writeText "ugit_${name}_keys" (
-                    builtins.concatStringsSep "\n" instanceCfg.authorizedKeys
-                  );
-
-                  authorizedKeysPath =
-                    if (builtins.length instanceCfg.authorizedKeys) > 0 then
-                      authorizedKeysFile
-                    else
-                      instanceCfg.authorizedKeysFile;
-                  args = [
-                    "--config=${configFile}"
-                    "--repo-dir=${instanceCfg.repoDir}"
-                    "--ssh.authorized-keys=${authorizedKeysPath}"
-                    "--ssh.host-key=${instanceCfg.hostKeyFile}"
-                  ];
-                in
-                "${instanceCfg.package}/bin/ugitd ${builtins.concatStringsSep " " args}";
         };
       };
-
+      ugit-hooks = {
-          "ugit-${name}-hooks" = {
-            description = "Setup hooks for ugit instance ${name}";
         wantedBy = [ "multi-user.target" ];
-            after = [ "ugit-${name}.service" ];
+        after = [ "ugit.service" ];
-            requires = [ "ugit-${name}.service" ];
+        requires = [ "ugit.service" ];
         serviceConfig = {
           Type = "oneshot";
-              RemainAfterExit = true;
-              User = instanceCfg.user;
-              Group = instanceCfg.group;
           ExecStart =
             let
-                  hookDir = "${instanceCfg.repoDir}/hooks/pre-receive.d";
+              script = pkgs.writeShellScript "ugit-hooks-link" (
-                  mkHookScript =
+                builtins.concatStringsSep "\n" (
-                    hook:
-                    let
-                      script = pkgs.writeShellScript "ugit-${name}-${hook.name}" hook.content;
-                    in
-                    ''
-                      mkdir -p ${hookDir}
-                      ln -sf ${script} ${hookDir}/${hook.name}
-                    '';
-                in
-                pkgs.writeShellScript "ugit-${name}-hooks-setup" ''
-                  ${builtins.concatStringsSep "\n" (map mkHookScript instanceCfg.hooks)}
-                '';
-            };
-          };
-        }
-      )
-    ) { } (builtins.attrNames cfg);
-
-    systemd.tmpfiles.settings = lib.mapAttrs' (
-      name: instanceCfg:
-      builtins.listToAttrs (
                   map (
                     hook:
                     let
                       script = pkgs.writeShellScript hook.name hook.content;
-            path = "${instanceCfg.repoDir}/hooks/pre-receive.d/${hook.name}";
+                      path = "${cfg.repoDir}/hooks/pre-receive.d/${hook.name}";
+                    in
+                    "ln -s ${script} ${path}"
+                  ) cfg.hooks
+                )
+              );
+            in
+            "${script}";
+        };
+      };
+    };
+
+    systemd.tmpfiles.settings.ugit = builtins.listToAttrs (
+      map (
+        hook:
+        let
+          script = pkgs.writeShellScript hook.name hook.content;
+          path = "${cfg.repoDir}/hooks/pre-receive.d/${hook.name}";
         in
         {
           name = path;
@@ -214,8 +183,7 @@ in
             };
           };
         }
-        ) instanceCfg.hooks
+      ) cfg.hooks
-      )
+    );
-    ) (lib.filterAttrs (name: instanceCfg: instanceCfg.enable) cfg);
   };
 }