diff options
author | mh <mh@immerda.ch> | 2013-01-02 20:55:28 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2013-01-02 20:56:27 +0100 |
commit | 23398fc3f0178f73fa3dee5149426b1b28ce3a8a (patch) | |
tree | 2ab3f84da5aa561fa54bdf71a6ca2bd26655e0bc /templates | |
parent | 6321144806ec67ff2d5a12df95b00f1250b8fcca (diff) | |
parent | c4913fb3e46624494a0935ec133b25db735afc30 (diff) | |
download | puppet-monkeysphere-23398fc3f0178f73fa3dee5149426b1b28ce3a8a.tar.gz puppet-monkeysphere-23398fc3f0178f73fa3dee5149426b1b28ce3a8a.tar.bz2 |
Merge remote-tracking branch 'vireo/master' into merge
Conflicts:
.gitignore
manifests/init.pp
Diffstat (limited to 'templates')
-rw-r--r-- | templates/host.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/host.erb b/templates/host.erb new file mode 100644 index 0000000..6412663 --- /dev/null +++ b/templates/host.erb @@ -0,0 +1,3 @@ +uid <%= monkeysphere_pgp_id %> +host_key <%= monkeysphere_ssh_fp %> +fingerprint <%= monkeysphere_pgp_fp %> |