diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-12-07 16:48:51 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-12-08 16:10:11 +0000 |
| commit | 83432149e212155469b1e9f06eb0095121377356 (patch) | |
| tree | 9029a2e7836dce3025d5c5a6527d74bbf8d799e5 /config | |
| parent | 04946cba49f19c0b6b876bccdbb36d47334af002 (diff) | |
| download | vyos-walinuxagent-83432149e212155469b1e9f06eb0095121377356.tar.gz vyos-walinuxagent-83432149e212155469b1e9f06eb0095121377356.zip | |
Import patches-unapplied version 2.1.2-0ubuntu1 to ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 04946cba49f19c0b6b876bccdbb36d47334af002
New changelog entries:
* New upstream release (LP: #1523715):
- Bug fixes for Ubuntu 15.10 on Azure
- Enablement for Azure Stack
- Dropped patch for systemd job as upstream now includes it.
Diffstat (limited to 'config')
| -rw-r--r-- | config/suse/waagent.conf | 10 | ||||
| -rw-r--r-- | config/ubuntu/waagent.conf | 12 | ||||
| -rw-r--r-- | config/waagent.conf | 8 |
3 files changed, 24 insertions, 6 deletions
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf index e429c74..b4f4798 100644 --- a/config/suse/waagent.conf +++ b/config/suse/waagent.conf @@ -1,5 +1,5 @@ # -# Windows Azure Linux Agent Configuration +# Microsoft Azure Linux Agent Configuration # # Specified program is invoked with the argument "Ready" when we report ready status @@ -34,6 +34,12 @@ Provisioning.DecodeCustomData=n # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n +# Algorithm used by crypt when generating password hash. +#Provisioning.PasswordCryptId=6 + +# Length of random salt used when generating password hash. +#Provisioning.PasswordCryptSaltLength=10 + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=y @@ -50,7 +56,7 @@ ResourceDisk.EnableSwap=n # Size of the swapfile. ResourceDisk.SwapSizeMB=0 -# Respond to load balancer probes if requested by Windows Azure. +# Respond to load balancer probes if requested by Microsoft Azure. LBProbeResponder=y # Enable verbose logging (y|n) diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf index ab50418..db29d80 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -1,5 +1,5 @@ # -# Windows Azure Linux Agent Configuration +# Microsoft Azure Linux Agent Configuration # # Specified program is invoked with the argument "Ready" when we report ready status @@ -34,6 +34,12 @@ Provisioning.DecodeCustomData=n # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n +# Algorithm used by crypt when generating password hash. +#Provisioning.PasswordCryptId=6 + +# Length of random salt used when generating password hash. +#Provisioning.PasswordCryptSaltLength=10 + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=n @@ -42,7 +48,7 @@ ResourceDisk.Format=n ResourceDisk.Filesystem=ext4 # Mount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource +ResourceDisk.MountPoint=/mnt # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n @@ -50,7 +56,7 @@ ResourceDisk.EnableSwap=n # Size of the swapfile. ResourceDisk.SwapSizeMB=0 -# Respond to load balancer probes if requested by Windows Azure. +# Respond to load balancer probes if requested by Microsoft Azure. LBProbeResponder=y # Enable verbose logging (y|n) diff --git a/config/waagent.conf b/config/waagent.conf index 4435d56..639e723 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -1,5 +1,5 @@ # -# Windows Azure Linux Agent Configuration +# Microsoft Azure Linux Agent Configuration # # Specified program is invoked with the argument "Ready" when we report ready status @@ -34,6 +34,12 @@ Provisioning.DecodeCustomData=n # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n +# Algorithm used by crypt when generating password hash. +#Provisioning.PasswordCryptId=6 + +# Length of random salt used when generating password hash. +#Provisioning.PasswordCryptSaltLength=10 + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=y |