diff options
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 4d48ed3..30035be 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,41 +27,39 @@ class monkeysphere( $keyserver = 'pool.sks-keyservers.net' ) { # The needed packages - package{'monkeysphere': + package { 'monkeysphere': ensure => $ensure_version, } $key = "ssh://${::fqdn}${port}" common::module_dir { [ 'monkeysphere', 'monkeysphere/hosts', 'monkeysphere/plugins' ]: } - # This was the old way which the module checked monkeysphere keys - file { "/usr/local/sbin/monkeysphere-check-key": - ensure => absent, - owner => root, - group => root, - mode => 0755, - content => "#!/bin/bash\n/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null || false", - } - file { "monkeysphere_conf": - path => "/etc/monkeysphere/monkeysphere.conf", - mode => 644, - ensure => present, - content => template("monkeysphere/monkeysphere.conf.erb"), - require => Package['monkeysphere'], - } - file { "monkeysphere_host_conf": - path => "/etc/monkeysphere/monkeysphere-host.conf", - mode => 644, - ensure => present, - content => template("monkeysphere/monkeysphere-host.conf.erb"), - require => Package['monkeysphere'], - } - file { "monkeysphere_authentication_conf": - path => "/etc/monkeysphere/monkeysphere-authentication.conf", - mode => 644, - ensure => present, - content => template("monkeysphere/monkeysphere-authentication.conf.erb"), - require => Package['monkeysphere'], + file { + # This was the old way which the module checked monkeysphere keys + '/usr/local/sbin/monkeysphere-check-key': + ensure => absent, + owner => root, + group => root, + mode => 0755, + content => "#!/bin/bash\n/usr/bin/gpg --homedir /var/lib/monkeysphere/host --list-keys '=$key' &> /dev/null || false"; + 'monkeysphere_conf': + path => '/etc/monkeysphere/monkeysphere.conf', + mode => 644, + ensure => present, + content => template('monkeysphere/monkeysphere.conf.erb'), + require => Package['monkeysphere']; + 'monkeysphere_host_conf': + path => '/etc/monkeysphere/monkeysphere-host.conf', + mode => 644, + ensure => present, + content => template('monkeysphere/monkeysphere-host.conf.erb'), + require => Package['monkeysphere']; + 'monkeysphere_authentication_conf': + path => '/etc/monkeysphere/monkeysphere-authentication.conf', + mode => 644, + ensure => present, + content => template('monkeysphere/monkeysphere-authentication.conf.erb'), + require => Package['monkeysphere']; } } |