commit 6df119a6ecd5e8fa624b4b7d012843883be6391c · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/networking/git-daemon.nix

···

       104
       104
        
       

     

       105
       105
        
         config = mkIf cfg.enable {

     

       106
       106
        
       

     

       107
       107
       -
           users.users = optionalAttrs (cfg.user != "git") {

     

       107
       107
       +
           users.users = optionalAttrs (cfg.user == "git") {

     

       108
       108
        
             git = {

     

       109
       109
        
               uid = config.ids.uids.git;

     

       110
       110
        
               description = "Git daemon user";

     

       111
       111
        
             };

     

       112
       112
        
           };

     

       113
       113
        
       

     

       114
       114
       -
           users.groups = optionalAttrs (cfg.group != "git") {

     

       114
       114
       +
           users.groups = optionalAttrs (cfg.group == "git") {

     

       115
       115
        
             git.gid = config.ids.gids.git;

     

       116
       116
        
           };

     

       117
       117

nixos/tests/all-tests.nix

···

       98
       98
        
         fsck = handleTest ./fsck.nix {};

     

       99
       99
        
         gotify-server = handleTest ./gotify-server.nix {};

     

       100
       100
        
         grocy = handleTest ./grocy.nix {};

     

       101
       101
       +
         gitdaemon = handleTest ./gitdaemon.nix {};

     

       101
       102
        
         gitea = handleTest ./gitea.nix {};

     

       102
       103
        
         gitlab = handleTest ./gitlab.nix {};

     

       103
       104
        
         gitolite = handleTest ./gitolite.nix {};

+64

nixos/tests/gitdaemon.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         hashes = pkgs.writeText "hashes" ''

     

       5
       5
       +
           b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c  /project/bar

     

       6
       6
       +
         '';

     

       7
       7
       +
       in {

     

       8
       8
       +
         name = "gitdaemon";

     

       9
       9
       +
       

     

       10
       10
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       11
       11
       +
           maintainers = [ tilpner ];

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nodes = {

     

       15
       15
       +
           server =

     

       16
       16
       +
             { config, ... }: {

     

       17
       17
       +
               networking.firewall.allowedTCPPorts = [ config.services.gitDaemon.port ];

     

       18
       18
       +
       

     

       19
       19
       +
               environment.systemPackages = [ pkgs.git ];

     

       20
       20
       +
       

     

       21
       21
       +
               services.gitDaemon = {

     

       22
       22
       +
                 enable = true;

     

       23
       23
       +
                 basePath = "/git";

     

       24
       24
       +
               };

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       27
       27
       +
           client =

     

       28
       28
       +
             { pkgs, ... }: {

     

       29
       29
       +
               environment.systemPackages = [ pkgs.git ];

     

       30
       30
       +
             };

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         testScript = ''

     

       34
       34
       +
           start_all()

     

       35
       35
       +
       

     

       36
       36
       +
           with subtest("create project.git"):

     

       37
       37
       +
               server.succeed(

     

       38
       38
       +
                   "mkdir /git",

     

       39
       39
       +
                   "git init --bare /git/project.git",

     

       40
       40
       +
                   "touch /git/project.git/git-daemon-export-ok",

     

       41
       41
       +
               )

     

       42
       42
       +
       

     

       43
       43
       +
           with subtest("add file to project.git"):

     

       44
       44
       +
               server.succeed(

     

       45
       45
       +
                   "git clone /git/project.git /project",

     

       46
       46
       +
                   "echo foo > /project/bar",

     

       47
       47
       +
                   "git config --global user.email 'you@example.com'",

     

       48
       48
       +
                   "git config --global user.name 'Your Name'",

     

       49
       49
       +
                   "git -C /project add bar",

     

       50
       50
       +
                   "git -C /project commit -m 'quux'",

     

       51
       51
       +
                   "git -C /project push",

     

       52
       52
       +
                   "rm -r /project",

     

       53
       53
       +
               )

     

       54
       54
       +
       

     

       55
       55
       +
           with subtest("git daemon starts"):

     

       56
       56
       +
               server.wait_for_unit("git-daemon.service")

     

       57
       57
       +
       

     

       58
       58
       +
           with subtest("client can clone project.git"):

     

       59
       59
       +
               client.succeed(

     

       60
       60
       +
                   "git clone git://server/project.git /project",

     

       61
       61
       +
                   "sha256sum -c ${hashes}",

     

       62
       62
       +
               )

     

       63
       63
       +
         '';

     

       64
       64
       +
       })