patch of nix: break out knot module into separate file · round #1 · pull #215 · tangled.org/core

+1 -170

flake.nix

···

       200
       200
        
             };

     

       201
       201
        
           });

     

       202
       202
        
       

     

       203
       203
       -
           nixosModules.knot = {

     

       204
       204
       -
             config,

     

       205
       205
       -
             pkgs,

     

       206
       206
       -
             lib,

     

       207
       207
       -
             ...

     

       208
       208
       -
           }: let

     

       209
       209
       -
             cfg = config.services.tangled-knot;

     

       210
       210
       -
           in

     

       211
       211
       -
             with lib; {

     

       212
       212
       -
               options = {

     

       213
       213
       -
                 services.tangled-knot = {

     

       214
       214
       -
                   enable = mkOption {

     

       215
       215
       -
                     type = types.bool;

     

       216
       216
       -
                     default = false;

     

       217
       217
       -
                     description = "Enable a tangled knot";

     

       218
       218
       -
                   };

     

       219
       219
       -
       

     

       220
       220
       -
                   appviewEndpoint = mkOption {

     

       221
       221
       -
                     type = types.str;

     

       222
       222
       -
                     default = "https://tangled.sh";

     

       223
       223
       -
                     description = "Appview endpoint";

     

       224
       224
       -
                   };

     

       225
       225
       -
       

     

       226
       226
       -
                   gitUser = mkOption {

     

       227
       227
       -
                     type = types.str;

     

       228
       228
       -
                     default = "git";

     

       229
       229
       -
                     description = "User that hosts git repos and performs git operations";

     

       230
       230
       -
                   };

     

       231
       231
       -
       

     

       232
       232
       -
                   openFirewall = mkOption {

     

       233
       233
       -
                     type = types.bool;

     

       234
       234
       -
                     default = true;

     

       235
       235
       -
                     description = "Open port 22 in the firewall for ssh";

     

       236
       236
       -
                   };

     

       237
       237
       -
       

     

       238
       238
       -
                   stateDir = mkOption {

     

       239
       239
       -
                     type = types.path;

     

       240
       240
       -
                     default = "/home/${cfg.gitUser}";

     

       241
       241
       -
                     description = "Tangled knot data directory";

     

       242
       242
       -
                   };

     

       243
       243
       -
       

     

       244
       244
       -
                   repo = {

     

       245
       245
       -
                     scanPath = mkOption {

     

       246
       246
       -
                       type = types.path;

     

       247
       247
       -
                       default = cfg.stateDir;

     

       248
       248
       -
                       description = "Path where repositories are scanned from";

     

       249
       249
       -
                     };

     

       250
       250
       -
       

     

       251
       251
       -
                     mainBranch = mkOption {

     

       252
       252
       -
                       type = types.str;

     

       253
       253
       -
                       default = "main";

     

       254
       254
       -
                       description = "Default branch name for repositories";

     

       255
       255
       -
                     };

     

       256
       256
       -
                   };

     

       257
       257
       -
       

     

       258
       258
       -
                   server = {

     

       259
       259
       -
                     listenAddr = mkOption {

     

       260
       260
       -
                       type = types.str;

     

       261
       261
       -
                       default = "0.0.0.0:5555";

     

       262
       262
       -
                       description = "Address to listen on";

     

       263
       263
       -
                     };

     

       264
       264
       -
       

     

       265
       265
       -
                     internalListenAddr = mkOption {

     

       266
       266
       -
                       type = types.str;

     

       267
       267
       -
                       default = "127.0.0.1:5444";

     

       268
       268
       -
                       description = "Internal address for inter-service communication";

     

       269
       269
       -
                     };

     

       270
       270
       -
       

     

       271
       271
       -
                     secretFile = mkOption {

     

       272
       272
       -
                       type = lib.types.path;

     

       273
       273
       -
                       example = "KNOT_SERVER_SECRET=<hash>";

     

       274
       274
       -
                       description = "File containing secret key provided by appview (required)";

     

       275
       275
       -
                     };

     

       276
       276
       -
       

     

       277
       277
       -
                     dbPath = mkOption {

     

       278
       278
       -
                       type = types.path;

     

       279
       279
       -
                       default = "${cfg.stateDir}/knotserver.db";

     

       280
       280
       -
                       description = "Path to the database file";

     

       281
       281
       -
                     };

     

       282
       282
       -
       

     

       283
       283
       -
                     hostname = mkOption {

     

       284
       284
       -
                       type = types.str;

     

       285
       285
       -
                       example = "knot.tangled.sh";

     

       286
       286
       -
                       description = "Hostname for the server (required)";

     

       287
       287
       -
                     };

     

       288
       288
       -
       

     

       289
       289
       -
                     dev = mkOption {

     

       290
       290
       -
                       type = types.bool;

     

       291
       291
       -
                       default = false;

     

       292
       292
       -
                       description = "Enable development mode (disables signature verification)";

     

       293
       293
       -
                     };

     

       294
       294
       -
                   };

     

       295
       295
       -
                 };

     

       296
       296
       -
               };

     

       297
       297
       -
       

     

       298
       298
       -
               config = mkIf cfg.enable {

     

       299
       299
       -
                 environment.systemPackages = with pkgs; [git];

     

       300
       300
       -
       

     

       301
       301
       -
                 system.activationScripts.gitConfig = ''

     

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

     

       303
       303
       -
                   chown -R ${cfg.gitUser}:${cfg.gitUser} \

     

       304
       304
       -
                       "${cfg.repo.scanPath}"

     

       305
       305
       -
       

     

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

     

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

     

       308
       308
       -
                   [user]

     

       309
       309
       -
                       name = Git User

     

       310
       310
       -
                       email = git@example.com

     

       311
       311
       -
                   EOF

     

       312
       312
       -
                   chown -R ${cfg.gitUser}:${cfg.gitUser} \

     

       313
       313
       -
                       "${cfg.stateDir}"

     

       314
       314
       -
                 '';

     

       315
       315
       -
       

     

       316
       316
       -
                 users.users.${cfg.gitUser} = {

     

       317
       317
       -
                   isSystemUser = true;

     

       318
       318
       -
                   useDefaultShell = true;

     

       319
       319
       -
                   home = cfg.stateDir;

     

       320
       320
       -
                   createHome = true;

     

       321
       321
       -
                   group = cfg.gitUser;

     

       322
       322
       -
                 };

     

       323
       323
       -
       

     

       324
       324
       -
                 users.groups.${cfg.gitUser} = {};

     

       325
       325
       -
       

     

       326
       326
       -
                 services.openssh = {

     

       327
       327
       -
                   enable = true;

     

       328
       328
       -
                   extraConfig = ''

     

       329
       329
       -
                     Match User ${cfg.gitUser}

     

       330
       330
       -
                         AuthorizedKeysCommand /etc/ssh/keyfetch_wrapper

     

       331
       331
       -
                         AuthorizedKeysCommandUser nobody

     

       332
       332
       -
                   '';

     

       333
       333
       -
                 };

     

       334
       334
       -
       

     

       335
       335
       -
                 environment.etc."ssh/keyfetch_wrapper" = {

     

       336
       336
       -
                   mode = "0555";

     

       337
       337
       -
                   text = ''

     

       338
       338
       -
                     #!${pkgs.stdenv.shell}

     

       339
       339
       -
                     ${self.packages.${pkgs.system}.knot}/bin/knot keys \

     

       340
       340
       -
                       -output authorized-keys \

     

       341
       341
       -
                       -internal-api "http://${cfg.server.internalListenAddr}" \

     

       342
       342
       -
                       -git-dir "${cfg.repo.scanPath}" \

     

       343
       343
       -
                       -log-path /tmp/knotguard.log

     

       344
       344
       -
                   '';

     

       345
       345
       -
                 };

     

       346
       346
       -
       

     

       347
       347
       -
                 systemd.services.knot = {

     

       348
       348
       -
                   description = "knot service";

     

       349
       349
       -
                   after = ["network.target" "sshd.service"];

     

       350
       350
       -
                   wantedBy = ["multi-user.target"];

     

       351
       351
       -
                   serviceConfig = {

     

       352
       352
       -
                     User = cfg.gitUser;

     

       353
       353
       -
                     WorkingDirectory = cfg.stateDir;

     

       354
       354
       -
                     Environment = [

     

       355
       355
       -
                       "KNOT_REPO_SCAN_PATH=${cfg.repo.scanPath}"

     

       356
       356
       -
                       "KNOT_REPO_MAIN_BRANCH=${cfg.repo.mainBranch}"

     

       357
       357
       -
                       "APPVIEW_ENDPOINT=${cfg.appviewEndpoint}"

     

       358
       358
       -
                       "KNOT_SERVER_INTERNAL_LISTEN_ADDR=${cfg.server.internalListenAddr}"

     

       359
       359
       -
                       "KNOT_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       360
       360
       -
                       "KNOT_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       361
       361
       -
                       "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       362
       362
       -
                     ];

     

       363
       363
       -
                     EnvironmentFile = cfg.server.secretFile;

     

       364
       364
       -
                     ExecStart = "${self.packages.${pkgs.system}.knot}/bin/knot server";

     

       365
       365
       -
                     Restart = "always";

     

       366
       366
       -
                   };

     

       367
       367
       -
                 };

     

       368
       368
       -
       

     

       369
       369
       -
                 networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [22];

     

       370
       370
       -
               };

     

       371
       371
       -
             };

     

       372
       372
       -
       

     

       373
       203
        
           nixosConfigurations.knotVM = nixpkgs.lib.nixosSystem {

     

       374
       204
        
             system = "x86_64-linux";

     

       375
       205
        
             modules = [

     
···

       403
       233
        
             ];

     

       404
       234
        
           };

     

       405
       235
        
           nixosModules.appview = import ./nix/modules/appview.nix {inherit self;};

     

       236
       236
       +
           nixosModules.knot = import ./nix/modules/knot.nix {inherit self;};

     

       406
       237
        
         };

     

       407
       238
        
       }

+172

nix/modules/knot.nix

···

       1
       1
       +
       {self}: {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: let

     

       7
       7
       +
         cfg = config.services.tangled-knot;

     

       8
       8
       +
       in

     

       9
       9
       +
         with lib; {

     

       10
       10
       +
           options = {

     

       11
       11
       +
             services.tangled-knot = {

     

       12
       12
       +
               enable = mkOption {

     

       13
       13
       +
                 type = types.bool;

     

       14
       14
       +
                 default = false;

     

       15
       15
       +
                 description = "Enable a tangled knot";

     

       16
       16
       +
               };

     

       17
       17
       +
       

     

       18
       18
       +
               appviewEndpoint = mkOption {

     

       19
       19
       +
                 type = types.str;

     

       20
       20
       +
                 default = "https://tangled.sh";

     

       21
       21
       +
                 description = "Appview endpoint";

     

       22
       22
       +
               };

     

       23
       23
       +
       

     

       24
       24
       +
               gitUser = mkOption {

     

       25
       25
       +
                 type = types.str;

     

       26
       26
       +
                 default = "git";

     

       27
       27
       +
                 description = "User that hosts git repos and performs git operations";

     

       28
       28
       +
               };

     

       29
       29
       +
       

     

       30
       30
       +
               openFirewall = mkOption {

     

       31
       31
       +
                 type = types.bool;

     

       32
       32
       +
                 default = true;

     

       33
       33
       +
                 description = "Open port 22 in the firewall for ssh";

     

       34
       34
       +
               };

     

       35
       35
       +
       

     

       36
       36
       +
               stateDir = mkOption {

     

       37
       37
       +
                 type = types.path;

     

       38
       38
       +
                 default = "/home/${cfg.gitUser}";

     

       39
       39
       +
                 description = "Tangled knot data directory";

     

       40
       40
       +
               };

     

       41
       41
       +
       

     

       42
       42
       +
               repo = {

     

       43
       43
       +
                 scanPath = mkOption {

     

       44
       44
       +
                   type = types.path;

     

       45
       45
       +
                   default = cfg.stateDir;

     

       46
       46
       +
                   description = "Path where repositories are scanned from";

     

       47
       47
       +
                 };

     

       48
       48
       +
       

     

       49
       49
       +
                 mainBranch = mkOption {

     

       50
       50
       +
                   type = types.str;

     

       51
       51
       +
                   default = "main";

     

       52
       52
       +
                   description = "Default branch name for repositories";

     

       53
       53
       +
                 };

     

       54
       54
       +
               };

     

       55
       55
       +
       

     

       56
       56
       +
               server = {

     

       57
       57
       +
                 listenAddr = mkOption {

     

       58
       58
       +
                   type = types.str;

     

       59
       59
       +
                   default = "0.0.0.0:5555";

     

       60
       60
       +
                   description = "Address to listen on";

     

       61
       61
       +
                 };

     

       62
       62
       +
       

     

       63
       63
       +
                 internalListenAddr = mkOption {

     

       64
       64
       +
                   type = types.str;

     

       65
       65
       +
                   default = "127.0.0.1:5444";

     

       66
       66
       +
                   description = "Internal address for inter-service communication";

     

       67
       67
       +
                 };

     

       68
       68
       +
       

     

       69
       69
       +
                 secretFile = mkOption {

     

       70
       70
       +
                   type = lib.types.path;

     

       71
       71
       +
                   example = "KNOT_SERVER_SECRET=<hash>";

     

       72
       72
       +
                   description = "File containing secret key provided by appview (required)";

     

       73
       73
       +
                 };

     

       74
       74
       +
       

     

       75
       75
       +
                 dbPath = mkOption {

     

       76
       76
       +
                   type = types.path;

     

       77
       77
       +
                   default = "${cfg.stateDir}/knotserver.db";

     

       78
       78
       +
                   description = "Path to the database file";

     

       79
       79
       +
                 };

     

       80
       80
       +
       

     

       81
       81
       +
                 hostname = mkOption {

     

       82
       82
       +
                   type = types.str;

     

       83
       83
       +
                   example = "knot.tangled.sh";

     

       84
       84
       +
                   description = "Hostname for the server (required)";

     

       85
       85
       +
                 };

     

       86
       86
       +
       

     

       87
       87
       +
                 dev = mkOption {

     

       88
       88
       +
                   type = types.bool;

     

       89
       89
       +
                   default = false;

     

       90
       90
       +
                   description = "Enable development mode (disables signature verification)";

     

       91
       91
       +
                 };

     

       92
       92
       +
               };

     

       93
       93
       +
             };

     

       94
       94
       +
           };

     

       95
       95
       +
       

     

       96
       96
       +
           config = mkIf cfg.enable {

     

       97
       97
       +
             environment.systemPackages = with pkgs; [

     

       98
       98
       +
               git

     

       99
       99
       +
               self.packages."${pkgs.system}".knot

     

       100
       100
       +
             ];

     

       101
       101
       +
       

     

       102
       102
       +
             system.activationScripts.gitConfig = ''

     

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

     

       104
       104
       +
               chown -R ${cfg.gitUser}:${cfg.gitUser} \

     

       105
       105
       +
                   "${cfg.repo.scanPath}"

     

       106
       106
       +
       

     

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

     

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

     

       109
       109
       +
               [user]

     

       110
       110
       +
                   name = Git User

     

       111
       111
       +
                   email = git@example.com

     

       112
       112
       +
               EOF

     

       113
       113
       +
               chown -R ${cfg.gitUser}:${cfg.gitUser} \

     

       114
       114
       +
                   "${cfg.stateDir}"

     

       115
       115
       +
             '';

     

       116
       116
       +
       

     

       117
       117
       +
             users.users.${cfg.gitUser} = {

     

       118
       118
       +
               isSystemUser = true;

     

       119
       119
       +
               useDefaultShell = true;

     

       120
       120
       +
               home = cfg.stateDir;

     

       121
       121
       +
               createHome = true;

     

       122
       122
       +
               group = cfg.gitUser;

     

       123
       123
       +
             };

     

       124
       124
       +
       

     

       125
       125
       +
             users.groups.${cfg.gitUser} = {};

     

       126
       126
       +
       

     

       127
       127
       +
             services.openssh = {

     

       128
       128
       +
               enable = true;

     

       129
       129
       +
               extraConfig = ''

     

       130
       130
       +
                 Match User ${cfg.gitUser}

     

       131
       131
       +
                     AuthorizedKeysCommand /etc/ssh/keyfetch_wrapper

     

       132
       132
       +
                     AuthorizedKeysCommandUser nobody

     

       133
       133
       +
               '';

     

       134
       134
       +
             };

     

       135
       135
       +
       

     

       136
       136
       +
             environment.etc."ssh/keyfetch_wrapper" = {

     

       137
       137
       +
               mode = "0555";

     

       138
       138
       +
               text = ''

     

       139
       139
       +
                 #!${pkgs.stdenv.shell}

     

       140
       140
       +
                 ${self.packages.${pkgs.system}.knot}/bin/knot keys \

     

       141
       141
       +
                   -output authorized-keys \

     

       142
       142
       +
                   -internal-api "http://${cfg.server.internalListenAddr}" \

     

       143
       143
       +
                   -git-dir "${cfg.repo.scanPath}" \

     

       144
       144
       +
                   -log-path /tmp/knotguard.log

     

       145
       145
       +
               '';

     

       146
       146
       +
             };

     

       147
       147
       +
       

     

       148
       148
       +
             systemd.services.knot = {

     

       149
       149
       +
               description = "knot service";

     

       150
       150
       +
               after = ["network.target" "sshd.service"];

     

       151
       151
       +
               wantedBy = ["multi-user.target"];

     

       152
       152
       +
               serviceConfig = {

     

       153
       153
       +
                 User = cfg.gitUser;

     

       154
       154
       +
                 WorkingDirectory = cfg.stateDir;

     

       155
       155
       +
                 Environment = [

     

       156
       156
       +
                   "KNOT_REPO_SCAN_PATH=${cfg.repo.scanPath}"

     

       157
       157
       +
                   "KNOT_REPO_MAIN_BRANCH=${cfg.repo.mainBranch}"

     

       158
       158
       +
                   "APPVIEW_ENDPOINT=${cfg.appviewEndpoint}"

     

       159
       159
       +
                   "KNOT_SERVER_INTERNAL_LISTEN_ADDR=${cfg.server.internalListenAddr}"

     

       160
       160
       +
                   "KNOT_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       161
       161
       +
                   "KNOT_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       162
       162
       +
                   "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       163
       163
       +
                 ];

     

       164
       164
       +
                 EnvironmentFile = cfg.server.secretFile;

     

       165
       165
       +
                 ExecStart = "${self.packages.${pkgs.system}.knot}/bin/knot server";

     

       166
       166
       +
                 Restart = "always";

     

       167
       167
       +
               };

     

       168
       168
       +
             };

     

       169
       169
       +
       

     

       170
       170
       +
             networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [22];

     

       171
       171
       +
           };

     

       172
       172
       +
         }