commit 73487f461941e89f1d4d76823e5d2fe2a2699f64 · pyrox.dev/nixpkgs

+11 -5

nixos/modules/virtualisation/azure-agent.nix

···

       54
       54
        
       

     

       55
       55
        
         ###### interface

     

       56
       56
        
       

     

       57
       57
       -
         options.virtualisation.azure.agent.enable = mkOption {

     

       58
       58
       -
           default = false;

     

       59
       59
       -
           description = "Whether to enable the Windows Azure Linux Agent.";

     

       57
       57
       +
         options.virtualisation.azure.agent = {

     

       58
       58
       +
           enable = mkOption {

     

       59
       59
       +
             default = false;

     

       60
       60
       +
             description = "Whether to enable the Windows Azure Linux Agent.";

     

       61
       61
       +
           };

     

       62
       62
       +
           verboseLogging = mkOption {

     

       63
       63
       +
             default = false;

     

       64
       64
       +
             description = "Whether to enable verbose logging.";

     

       65
       65
       +
           };

     

       60
       66
        
         };

     

       61
       67
        
       

     

       62
       68
        
         ###### implementation

     
···

       88
       94
        
               Provisioning.DeleteRootPassword=n

     

       89
       95
        
       

     

       90
       96
        
               # Generate fresh host key pair.

     

       91
       91
       -
               Provisioning.RegenerateSshHostKeyPair=y

     

       97
       97
       +
               Provisioning.RegenerateSshHostKeyPair=n

     

       92
       98
        
       

     

       93
       99
        
               # Supported values are "rsa", "dsa" and "ecdsa".

     

       94
       100
        
               Provisioning.SshHostKeyPairType=ed25519

     
···

       121
       127
        
               Logs.Console=y

     

       122
       128
        
       

     

       123
       129
        
               # Enable verbose logging (y|n)

     

       124
       124
       -
               Logs.Verbose=n

     

       130
       130
       +
               Logs.Verbose=${if cfg.verboseLogging then "y" else "n"}

     

       125
       131
        
       

     

       126
       132
        
               # Root device timeout in seconds.

     

       127
       133
        
               OS.RootDeviceScsiTimeout=300

+1

nixos/modules/virtualisation/azure-common.nix

···

       6
       6
        
       

     

       7
       7
        
         require = [ ./azure-agent.nix ];

     

       8
       8
        
         virtualisation.azure.agent.enable = true;

     

       9
       9
       +
         virtualisation.azure.agent.verboseLogging = true;

     

       9
       10
        
       

     

       10
       11
        
         boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];

     

       11
       12
        
         boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];

+1 -1

nixos/modules/virtualisation/azure-image.nix

···

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

     

       5
       5
       -
         diskSize = "4096";

     

       5
       5
       +
         diskSize = "30720";

     

       6
       6
        
       in

     

       7
       7
        
       {

     

       8
       8
        
         system.build.azureImage =