diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2016-03-10 23:15:52 -0800 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2016-03-13 13:57:30 +0200 |
| commit | 73487f461941e89f1d4d76823e5d2fe2a2699f64 (patch) | |
| tree | be624e89b2716d3fc9bbdc917c929fe7a2871a6d | |
| parent | c6834ab5276c81d80d22b7b172fe92783f537123 (diff) | |
| download | nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar.gz nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar.bz2 nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar.lz nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar.xz nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.tar.zst nixpkgs-73487f461941e89f1d4d76823e5d2fe2a2699f64.zip | |
virtualization/azure: fixes
azure-agent: add option for verbose logging azure-agent: disable ssh host key regeneration azure-common: set verbose logging on azure-image: increase size to 30GB
| -rw-r--r-- | nixos/modules/virtualisation/azure-agent.nix | 16 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/azure-common.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/azure-image.nix | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 640519758c7..6b60419c290 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -54,9 +54,15 @@ in ###### interface - options.virtualisation.azure.agent.enable = mkOption { - default = false; - description = "Whether to enable the Windows Azure Linux Agent."; + options.virtualisation.azure.agent = { + enable = mkOption { + default = false; + description = "Whether to enable the Windows Azure Linux Agent."; + }; + verboseLogging = mkOption { + default = false; + description = "Whether to enable verbose logging."; + }; }; ###### implementation @@ -88,7 +94,7 @@ in Provisioning.DeleteRootPassword=n # Generate fresh host key pair. - Provisioning.RegenerateSshHostKeyPair=y + Provisioning.RegenerateSshHostKeyPair=n # Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=ed25519 @@ -121,7 +127,7 @@ in Logs.Console=y # Enable verbose logging (y|n) - Logs.Verbose=n + Logs.Verbose=${if cfg.verboseLogging then "y" else "n"} # Root device timeout in seconds. OS.RootDeviceScsiTimeout=300 diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index eedf115ee15..9ee4d9cf8d5 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -6,6 +6,7 @@ with lib; require = [ ./azure-agent.nix ]; virtualisation.azure.agent.enable = true; + virtualisation.azure.agent.verboseLogging = true; boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 79d1f7d7cc4..f7949b50137 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,7 +2,7 @@ with lib; let - diskSize = "4096"; + diskSize = "30720"; in { system.build.azureImage = |