summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-02-25 14:33:16 -0500
committerScott Moser <smoser@ubuntu.com>2016-02-25 14:33:16 -0500
commit4d8e7324c7242e1c969c8561462def6c1cda747c (patch)
tree6ab76ff494ceeb75b567b7c247791d1b6dac03a3 /doc
parentb20191f04c586147165a304b88a2b89c89f79225 (diff)
parentdf6af3e1433b9e5564bec7cd452cfb3a0fb403e9 (diff)
downloadvyos-cloud-init-4d8e7324c7242e1c969c8561462def6c1cda747c.tar.gz
vyos-cloud-init-4d8e7324c7242e1c969c8561462def6c1cda747c.zip
merge with trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/cloud-config-user-groups.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
index 31491faf..0e8ed243 100644
--- a/doc/examples/cloud-config-user-groups.txt
+++ b/doc/examples/cloud-config-user-groups.txt
@@ -15,14 +15,14 @@ users:
selinux-user: staff_u
expiredate: 2012-09-01
ssh-import-id: foobar
- lock-passwd: false
+ lock_passwd: false
passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
- name: barfoo
gecos: Bar B. Foo
sudo: ALL=(ALL) NOPASSWD:ALL
groups: users, admin
ssh-import-id: None
- lock-passwd: true
+ lock_passwd: true
ssh-authorized-keys:
- <ssh pub key 1>
- <ssh pub key 2>
@@ -42,7 +42,7 @@ users:
# selinux-user: Optional. The SELinux user for the user's login, such as
# "staff_u". When this is omitted the system will select the default
# SELinux user.
-# lock-passwd: Defaults to true. Lock the password to disable password login
+# lock_passwd: Defaults to true. Lock the password to disable password login
# inactive: Create the user as inactive
# passwd: The hash -- not the password itself -- of the password you want
# to use for this user. You can generate a safe hash via: