summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2016-02-15 13:12:38 +0000
committerDaniel Watkins <daniel.watkins@canonical.com>2016-02-15 13:12:38 +0000
commit333f17dfa44e20712a2a88ef985a844b016957ce (patch)
treec0e4d06ecaf130888ee26ae0f07eaf68f537d600
parent6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff)
parent601535f5cb457a50180c99010fa6406b99da2b13 (diff)
downloadvyos-cloud-init-333f17dfa44e20712a2a88ef985a844b016957ce.tar.gz
vyos-cloud-init-333f17dfa44e20712a2a88ef985a844b016957ce.zip
Correct lock_passwd in docs
-rw-r--r--ChangeLog1
-rw-r--r--doc/examples/cloud-config-user-groups.txt6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 95d9c3eb..73615b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
[Robert C Jennings]
- systemd: support using systemd-detect-virt to detect container
(LP: #1539016) [Martin Pitt]
+ - docs: fix lock_passwd documentation [Robert C Jennings]
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
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: