back round 0 view raw

nix: change default vm knot port to 6444 #848

merged

opened by

boltless.me 1 week ago targeting master from sl/rsumuwrmxwku

close: https://tangled.org/tangled.org/core/issues/315

options

unified split

Changed files

+5 -5

docs

hacking.md

nix

vm.nix

+1 -1

docs/hacking.md

···

       117
       117
        
       # type `poweroff` at the shell to exit the VM

     

       118
       118
        
       ```

     

       119
       119
        
       

     

       120
       120
       -
       This starts a knot on port 6000, a spindle on port 6555

     

       120
       120
       +
       This starts a knot on port 6444, a spindle on port 6555

     

       121
       121
        
       with `ssh` exposed on port 2222.

     

       122
       122
        
       

     

       123
       123
        
       Once the services are running, head to

+4 -4

nix/vm.nix

···

       48
       48
        
                   # knot

     

       49
       49
        
                   {

     

       50
       50
        
                     from = "host";

     

       51
       51
       -
                     host.port = 6000;

     

       52
       52
       -
                     guest.port = 6000;

     

       51
       51
       +
                     host.port = 6444;

     

       52
       52
       +
                     guest.port = 6444;

     

       53
       53
        
                   }

     

       54
       54
        
                   # spindle

     

       55
       55
        
                   {

     
···

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

     

       88
       88
        
                 server = {

     

       89
       89
        
                   owner = envVar "TANGLED_VM_KNOT_OWNER";

     

       90
       90
       -
                   hostname = envVarOr "TANGLED_VM_KNOT_HOST" "localhost:6000";

     

       90
       90
       +
                   hostname = envVarOr "TANGLED_VM_KNOT_HOST" "localhost:6444";

     

       91
       91
        
                   plcUrl = plcUrl;

     

       92
       92
        
                   jetstreamEndpoint = jetstream;

     

       93
       93
       -
                   listenAddr = "0.0.0.0:6000";

     

       93
       93
       +
                   listenAddr = "0.0.0.0:6444";

     

       94
       94
        
                 };

     

       95
       95
        
               };

     

       96
       96
        
               services.tangled.spindle = {