interdiff of round #1 and #0 · pull #466 · tangled.org/core

ERROR
.gitignore
Failed to calculate interdiff for this file.
ERROR
docs/hacking.md
Failed to calculate interdiff for this file.
ERROR
flake.nix
Failed to calculate interdiff for this file.
ERROR
nix/vm.nix
Failed to calculate interdiff for this file.
NEW
nix/modules/knot.nix
···

       126
       126
        
               cfg.package

     

       127
       127
        
             ];

     

       128
       128
        
       

     

       129
       129
       -
             system.activationScripts.gitConfig = let

     

       130
       130
       -
               setMotd =

     

       131
       131
       -
                 if cfg.motdFile != null && cfg.motd != null

     

       132
       132
       -
                 then throw "motdFile and motd cannot be both set"

     

       133
       133
       -
                 else ''

     

       134
       134
       -
                   ${optionalString (cfg.motdFile != null) "cat ${cfg.motdFile} > ${cfg.stateDir}/motd"}

     

       135
       135
       -
                   ${optionalString (cfg.motd != null) ''printf "${cfg.motd}" > ${cfg.stateDir}/motd''}

     

       136
       136
       -
                 '';

     

       137
       137
       -
             in ''

     

       138
       138
       -
               mkdir -p "${cfg.repo.scanPath}"

     

       139
       139
       -
               chown -R ${cfg.gitUser}:${cfg.gitUser} "${cfg.repo.scanPath}"

     

       140
       140
       -
       

     

       141
       141
       -
               mkdir -p "${cfg.stateDir}/.config/git"

     

       142
       142
       -
               cat > "${cfg.stateDir}/.config/git/config" << EOF

     

       143
       143
       -
               [user]

     

       144
       144
       -
                   name = Git User

     

       145
       145
       -
                   email = git@example.com

     

       146
       146
       -
               [receive]

     

       147
       147
       -
                   advertisePushOptions = true

     

       148
       148
       -
               EOF

     

       149
       149
       -
               ${setMotd}

     

       150
       150
       -
               chown -R ${cfg.gitUser}:${cfg.gitUser} "${cfg.stateDir}"

     

       151
       151
       -
             '';

     

       152
       152
       -
       

     

       153
       129
        
             users.users.${cfg.gitUser} = {

     

       154
       130
        
               isSystemUser = true;

     

       155
       131
        
               useDefaultShell = true;

     
···

       185
       161
        
               description = "knot service";

     

       186
       162
        
               after = ["network.target" "sshd.service"];

     

       187
       163
        
               wantedBy = ["multi-user.target"];

     

       164
       164
       +
               enableStrictShellChecks = true;

     

       165
       165
       +
       

     

       166
       166
       +
               preStart = let

     

       167
       167
       +
                 setMotd =

     

       168
       168
       +
                   if cfg.motdFile != null && cfg.motd != null

     

       169
       169
       +
                   then throw "motdFile and motd cannot be both set"

     

       170
       170
       +
                   else ''

     

       171
       171
       +
                     ${optionalString (cfg.motdFile != null) "cat ${cfg.motdFile} > ${cfg.stateDir}/motd"}

     

       172
       172
       +
                     ${optionalString (cfg.motd != null) ''printf "${cfg.motd}" > ${cfg.stateDir}/motd''}

     

       173
       173
       +
                   '';

     

       174
       174
       +
               in ''

     

       175
       175
       +
                 mkdir -p "${cfg.repo.scanPath}"

     

       176
       176
       +
                 chown -R ${cfg.gitUser}:${cfg.gitUser} "${cfg.repo.scanPath}"

     

       177
       177
       +
       

     

       178
       178
       +
                 mkdir -p "${cfg.stateDir}/.config/git"

     

       179
       179
       +
                 cat > "${cfg.stateDir}/.config/git/config" << EOF

     

       180
       180
       +
                 [user]

     

       181
       181
       +
                     name = Git User

     

       182
       182
       +
                     email = git@example.com

     

       183
       183
       +
                 [receive]

     

       184
       184
       +
                     advertisePushOptions = true

     

       185
       185
       +
                 EOF

     

       186
       186
       +
                 ${setMotd}

     

       187
       187
       +
                 chown -R ${cfg.gitUser}:${cfg.gitUser} "${cfg.stateDir}"

     

       188
       188
       +
               '';

     

       189
       189
       +
       

     

       188
       190
        
               serviceConfig = {

     

       189
       191
        
                 User = cfg.gitUser;

     

       192
       192
       +
                 PermissionsStartOnly = true;

     

       190
       193
        
                 WorkingDirectory = cfg.stateDir;

     

       191
       194
        
                 Environment = [

     

       192
       195
        
                   "KNOT_REPO_SCAN_PATH=${cfg.repo.scanPath}"