Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix syntax in example #72

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix syntax in example #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both "pubkey:" and "pubkeys:" formats are supported. The "pubkeys:" format is documented on line 40. I kind of agree that it's confusing to have two different ways, but the current documentation is correct, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally still valid! Just not fun to add all the brackets and curlies to convert from string to list.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably my eyes that are not as good as they used to. I think the proposed change of documenting multiple keys is already documented on line 40? So copy pasting should work as it has the pubkeys in a list?

Honestly I don't really mind either way, and I can merge this too, I was just wondering if there is something I'm missing?

Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ More examples can be found in tests/test.yml:
<pre>
admingroup: "admin"
adminshell: "/bin/bash"
adminusers:
- {name: admin1, state: 'present', uid: 5001, group: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa KEY [email protected]" }
adminremove_passwords: false
- {name: badadmin2, state: 'absent', uid: 5001, group: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa KEY [email protected]" }
- {name: rsyncuser1, state: 'present', uid: 5003, group: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa KEY [email protected]", options: 'command="/usr/local/bin/rrsync /allow/rrsync/here/directory",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding' }
adminusers:
- {name: admin1, state: 'present', uid: 5001, group: "{{admingroup}}", shell: "{{adminshell}}", pubkeys: [ { pubkey: "ssh-rsa KEY [email protected]" } ] }
- {name: badadmin2, state: 'absent', uid: 5001, group: "{{admingroup}}", shell: "{{adminshell}}", pubkeys: [ { pubkey: "ssh-rsa KEY [email protected]" } ] }
- {name: rsyncuser1, state: 'present', uid: 5003, group: "{{admingroup}}", shell: "{{adminshell}}", pubkeys: [ { pubkey: "ssh-rsa KEY [email protected]", options: 'command="/usr/local/bin/rrsync /allow/rrsync/here/directory",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding' } ] }
</pre>

- adminremove_passwords: True
Expand Down