cloud-init

Merge lp:~rcj/cloud-init/lock_passwd-doc-fix into lp:~cloud-init-dev/cloud-init/trunk

  1. lock_passwd-doc-fix
  2. Merge into trunk
Proposed by Robert C Jennings
Status: Merged
Merged at revision: 1161
Proposed branch: lp:~rcj/cloud-init/lock_passwd-doc-fix
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 29 lines (+3/-3)
1 file modified
doc/examples/cloud-config-user-groups.txt (+3/-3)
To merge this branch: bzr merge lp:~rcj/cloud-init/lock_passwd-doc-fix
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+284486@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/examples/cloud-config-user-groups.txt'
--- doc/examples/cloud-config-user-groups.txt 2014-06-10 00:38:09 +0000
+++ doc/examples/cloud-config-user-groups.txt 2016-01-29 17:49:16 +0000
@@ -15,14 +15,14 @@
15 selinux-user: staff_u15 selinux-user: staff_u
16 expiredate: 2012-09-0116 expiredate: 2012-09-01
17 ssh-import-id: foobar17 ssh-import-id: foobar
18 lock-passwd: false18 lock_passwd: false
19 passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/19 passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
20 - name: barfoo20 - name: barfoo
21 gecos: Bar B. Foo21 gecos: Bar B. Foo
22 sudo: ALL=(ALL) NOPASSWD:ALL22 sudo: ALL=(ALL) NOPASSWD:ALL
23 groups: users, admin23 groups: users, admin
24 ssh-import-id: None24 ssh-import-id: None
25 lock-passwd: true25 lock_passwd: true
26 ssh-authorized-keys:26 ssh-authorized-keys:
27 - <ssh pub key 1>27 - <ssh pub key 1>
28 - <ssh pub key 2>28 - <ssh pub key 2>
@@ -42,7 +42,7 @@
42# selinux-user: Optional. The SELinux user for the user's login, such as42# selinux-user: Optional. The SELinux user for the user's login, such as
43# "staff_u". When this is omitted the system will select the default43# "staff_u". When this is omitted the system will select the default
44# SELinux user.44# SELinux user.
45# lock-passwd: Defaults to true. Lock the password to disable password login45# lock_passwd: Defaults to true. Lock the password to disable password login
46# inactive: Create the user as inactive46# inactive: Create the user as inactive
47# passwd: The hash -- not the password itself -- of the password you want47# passwd: The hash -- not the password itself -- of the password you want
48# to use for this user. You can generate a safe hash via:48# to use for this user. You can generate a safe hash via: