aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-03-07 17:33:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-03-07 17:33:36 -0300
commit059386f2de985192f8c0d749154717833e9bc71d (patch)
tree669ab45ff6bc42c4c8c203e09601da7e64551cb0 /manifests
parent047b23cb344e4f029f0c7c5d1c8ce7fe8737dc6d (diff)
downloadpuppet-monkeysphere-059386f2de985192f8c0d749154717833e9bc71d.tar.gz
puppet-monkeysphere-059386f2de985192f8c0d749154717833e9bc71d.tar.bz2
Introducing $monkeysphere_ssh_port
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp15
1 files changed, 11 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 9cf87db..7805944 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,19 +23,26 @@ class monkeysphere {
# The needed packages
package { monkeysphere: ensure => installed, }
+ $ssh_port = $monkeysphere_ssh_port ? {
+ '' => '',
+ default => ":$monkeysphere_ssh_port",
+ }
+
+ $key = "ssh://${fqdn}{$ssh_port}"
+
# Server host key publication
case $monkeysphere_publish_key {
false: {
- exec { "/usr/sbin/monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key ssh://$fqdn":
- unless => "/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=ssh://$fqdn' &> /dev/null",
+ exec { "/usr/sbin/monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key $key":
+ unless => "/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null",
user => "root",
require => Package["monkeysphere"],
}
}
default: {
- exec { "/usr/sbin/monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key $fqdn && \
+ exec { "/usr/sbin/monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key $key && \
/usr/sbin/monkeysphere-host publish-key":
- unless => "/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=ssh://$fqdn' &> /dev/null",
+ unless => "/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null",
user => "root",
require => Package["monkeysphere"],
}