Changes for puppet 4 compatibility

1 files changed, 11 insertions, 4 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 31dea9a..b06a535 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,6 +34,13 @@ class monkeysphere(
     ensure => $ensure_version,
   }
 
+  if $ssh_port != '' {
+    $port = ":${ssh_port}"
+  }
+  else {
+    $port = ''
+  }
+
   $key = "ssh://${::fqdn}${port}"
 
   file {
@@ -42,23 +49,23 @@ class monkeysphere(
       ensure  => absent,
       owner   => root,
       group   => root,
-      mode    => 0755,
+      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,
+      mode => '644',
       ensure => present,
       content => template('monkeysphere/monkeysphere.conf.erb'),
       require => Package['monkeysphere'];
     'monkeysphere_host_conf':
       path => '/etc/monkeysphere/monkeysphere-host.conf',
-      mode => 644,
+      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,
+      mode => '644',
       ensure => present,
       content => template('monkeysphere/monkeysphere-authentication.conf.erb'),
       require => Package['monkeysphere'];