back round 7 view raw

nix: add `plcUrl` options for `services.{knot,spindle}` #699

closed

opened by

boltless.me 1 month ago targeting master from sandboxed-atmosphere

Signed-off-by: Seongmin Lee git@boltless.me

options

unified split

Changed files

+22 -1

nix

modules

knot.nix

spindle.nix

+14

nix/modules/knot.nix

···

       111
        
                   description = "Hostname for the server (required)";

     

       112
        
                 };

     

       113
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       114
        
                 dev = mkOption {

     

       115
        
                   type = types.bool;

     

       116
        
                   default = false;

     
···

       199
        
                   "KNOT_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       200
        
                   "KNOT_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       201
        
                   "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       0
        
       
     

       0
        
       
     

       202
        
                   "KNOT_SERVER_OWNER=${cfg.server.owner}"

     

       203
        
                 ];

     

       204
        
                 ExecStart = "${cfg.package}/bin/knot server";

···

       111
        
                   description = "Hostname for the server (required)";

     

       112
        
                 };

     

       113
        
       

     

       114
       +
                 plcUrl = mkOption {

     

       115
       +
                   type = types.str;

     

       116
       +
                   default = "https://plc.directory";

     

       117
       +
                   description = "atproto PLC directory";

     

       118
       +
                 };

     

       119
       +
       

     

       120
       +
                 jetstreamEndpoint = mkOption {

     

       121
       +
                   type = types.str;

     

       122
       +
                   default = "wss://jetstream1.us-west.bsky.network/subscribe";

     

       123
       +
                   description = "Jetstream endpoint to subscribe to";

     

       124
       +
                 };

     

       125
       +
       

     

       126
        
                 dev = mkOption {

     

       127
        
                   type = types.bool;

     

       128
        
                   default = false;

     
···

       211
        
                   "KNOT_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       212
        
                   "KNOT_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       213
        
                   "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       214
       +
                   "KNOT_SERVER_PLC_URL=${cfg.server.plcUrl}"

     

       215
       +
                   "KNOT_SERVER_JETSTREAM_ENDPOINT=${cfg.server.jetstreamEndpoint}"

     

       216
        
                   "KNOT_SERVER_OWNER=${cfg.server.owner}"

     

       217
        
                 ];

     

       218
        
                 ExecStart = "${cfg.package}/bin/knot server";

+8 -1

nix/modules/spindle.nix

···

       37
        
                   description = "Hostname for the server (required)";

     

       38
        
                 };

     

       39
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
                 jetstreamEndpoint = mkOption {

     

       41
        
                   type = types.str;

     

       42
        
                   default = "wss://jetstream1.us-west.bsky.network/subscribe";

     
···

       119
        
                   "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       120
        
                   "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       121
        
                   "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       122
       -
                   "SPINDLE_SERVER_JETSTREAM=${cfg.server.jetstreamEndpoint}"

     

       0
        
       
     

       123
        
                   "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"

     

       124
        
                   "SPINDLE_SERVER_OWNER=${cfg.server.owner}"

     

       125
        
                   "SPINDLE_SERVER_MAX_JOB_COUNT=${toString cfg.server.maxJobCount}"

···

       37
        
                   description = "Hostname for the server (required)";

     

       38
        
                 };

     

       39
        
       

     

       40
       +
                 plcUrl = mkOption {

     

       41
       +
                   type = types.str;

     

       42
       +
                   default = "https://plc.directory";

     

       43
       +
                   description = "atproto PLC directory";

     

       44
       +
                 };

     

       45
       +
       

     

       46
        
                 jetstreamEndpoint = mkOption {

     

       47
        
                   type = types.str;

     

       48
        
                   default = "wss://jetstream1.us-west.bsky.network/subscribe";

     
···

       125
        
                   "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}"

     

       126
        
                   "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}"

     

       127
        
                   "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       128
       +
                   "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}"

     

       129
       +
                   "SPINDLE_SERVER_JETSTREAM_ENDPOINT=${cfg.server.jetstreamEndpoint}"

     

       130
        
                   "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"

     

       131
        
                   "SPINDLE_SERVER_OWNER=${cfg.server.owner}"

     

       132
        
                   "SPINDLE_SERVER_MAX_JOB_COUNT=${toString cfg.server.maxJobCount}"