back round 1 view raw

nix: modules: knot: add options for configuring motd #383

merged

opened by

ptr.pet 4 months ago targeting master from ptr.pet/core: master

Signed-off-by: dusk y.bera003.06@protonmail.com

options

unified split

Changed files

+33 -1

nix

modules

knot.nix

vm.nix

+32 -1

nix/modules/knot.nix

···

       58
       58
        
                 };

     

       59
       59
        
               };

     

       60
       60
        
       

     

       61
       61
       +
               motd = mkOption {

     

       62
       62
       +
                 type = types.nullOr types.str;

     

       63
       63
       +
                 default = null;

     

       64
       64
       +
                 description = ''

     

       65
       65
       +
                   Message of the day

     

       66
       66
       +
       

     

       67
       67
       +
                   The contents are shown as-is; eg. you will want to add a newline if

     

       68
       68
       +
                   setting a non-empty message since the knot won't do this for you.

     

       69
       69
       +
                 '';

     

       70
       70
       +
               };

     

       71
       71
       +
       

     

       72
       72
       +
               motdFile = mkOption {

     

       73
       73
       +
                 type = types.nullOr types.path;

     

       74
       74
       +
                 default = null;

     

       75
       75
       +
                 description = ''

     

       76
       76
       +
                   File containing message of the day

     

       77
       77
       +
       

     

       78
       78
       +
                   The contents are shown as-is; eg. you will want to add a newline if

     

       79
       79
       +
                   setting a non-empty message since the knot won't do this for you.

     

       80
       80
       +
                 '';

     

       81
       81
       +
               };

     

       82
       82
       +
       

     

       61
       83
        
               server = {

     

       62
       84
        
                 listenAddr = mkOption {

     

       63
       85
        
                   type = types.str;

     
···

       104
       126
        
               cfg.package

     

       105
       127
        
             ];

     

       106
       128
        
       

     

       107
       107
       -
             system.activationScripts.gitConfig = ''

     

       129
       129
       +
             system.activationScripts.gitConfig = let

     

       130
       130
       +
               setMotd =

     

       131
       131
       +
                 if cfg.motdFile != null && cfg.motd != null then

     

       132
       132
       +
                   throw "motdFile and motd cannot be both set"

     

       133
       133
       +
                 else ''

     

       134
       134
       +
                   ${if cfg.motdFile != null then "cat ${cfg.motdFile} > ${cfg.stateDir}/motd" else ""}

     

       135
       135
       +
                   ${if cfg.motd != null then ''printf "${cfg.motd}" > ${cfg.stateDir}/motd'' else ""}

     

       136
       136
       +
                 '';

     

       137
       137
       +
             in ''

     

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

     

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

     

       110
       140
        
       

     
···

       116
       146
        
               [receive]

     

       117
       147
        
                   advertisePushOptions = true

     

       118
       148
        
               EOF

     

       149
       149
       +
               ${setMotd}

     

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

     

       120
       151
        
             '';

     

       121
       152

nix/vm.nix

···

       48
       48
        
             ];

     

       49
       49
        
             services.tangled-knot = {

     

       50
       50
        
               enable = true;

     

       51
       51
       +
               motd = "Welcome to the development knot!\n";

     

       51
       52
        
               server = {

     

       52
       53
        
                 secretFile = "/var/lib/knot/secret";

     

       53
       54
        
                 hostname = "localhost:6000";