From b95bcf1b9d7ad84bc960cfa61d0a9e61852a33a5 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sun, 18 Nov 2012 18:14:17 +0100 Subject: [PATCH] Use single-quotes to contain SSH keys as they may contain double-quotes Fixes #1624. --- docsite/rst/playbooks2.rst | 2 +- library/authorized_key | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docsite/rst/playbooks2.rst b/docsite/rst/playbooks2.rst index ab69d7ee3b..3c20f6bac9 100644 --- a/docsite/rst/playbooks2.rst +++ b/docsite/rst/playbooks2.rst @@ -402,7 +402,7 @@ This syntax will remain in future versions, though we will also will provide way is an example using the authorized_key module, which requires the actual text of the SSH key as a parameter:: tasks: - - authorized_key name=$item key="$FILE('/keys/$user1')" + - authorized_key name=$item key='$FILE(/keys/$item)' with_items: - pinky - brain diff --git a/library/authorized_key b/library/authorized_key index 1b8153aa68..fbb7be8ca5 100755 --- a/library/authorized_key +++ b/library/authorized_key @@ -49,7 +49,7 @@ options: examples: - code: 'authorized_key: user=charlie key="ssh-dss ASDF1234L+8BTwaRYr/rycsBF1D8e5pTxEsXHQs4iq+mZdyWqlW++L6pMiam1A8yweP+rKtgjK2httVS6GigVsuWWfOd7/sdWippefq74nppVUELHPKkaIOjJNN1zUHFoL/YMwAAAEBALnAsQN10TNGsRDe5arBsW8cTOjqLyYBcIqgPYTZW8zENErFxt7ij3fW3Jh/sCpnmy8rkS7FyK8ULX0PEy/2yDx8/5rXgMIICbRH/XaBy9Ud5bRBFVkEDu/r+rXP33wFPHjWjwvHAtfci1NRBAudQI/98DbcGQw5HmE89CjgZRo5ktkC5yu/8agEPocVjdHyZr7PaHfxZGUDGKtGRL2QzRYukCmWo1cZbMBHcI5FzImvTHS9/8B3SATjXMPgbfBuEeBwuBK5EjL+CtHY5bWs9kmYjmeo0KfUMH8hY4MAXDoKhQ7DhBPIrcjS5jPtoGxIREZjba67r6/P2XKXaCZH6Fc= charlie@example.org 2011-01-17"' description: "Example from Ansible Playbooks" - - code: "authorized_key: user=charlie key=$FILE(/home/charlie/.ssh/id_rsa.pub)" + - code: "authorized_key: user=charlie key='$FILE(/home/charlie/.ssh/id_rsa.pub)'" description: "Shorthand available in Ansible 0.8 and later" author: Brad Olson '''