Changes for puppet 4 compatibility

3 files changed, 18 insertions, 11 deletions

diff --git a/manifests/authorized_user_ids.pp b/manifests/authorized_user_ids.pp
index 09fd182..dbe9ed3 100644
--- a/manifests/authorized_user_ids.pp
+++ b/manifests/authorized_user_ids.pp
@@ -18,7 +18,7 @@ define monkeysphere::authorized_user_ids(
         $dest_dir:
           owner => $user,
           group => $calculated_group,
-          mode => 755,
+          mode => '755',
           ensure => directory,
       }
     }
@@ -27,7 +27,7 @@ define monkeysphere::authorized_user_ids(
         $dest_dir:
           owner => $user,
           group => $calculated_group,
-          mode => 755,
+          mode => '755',
           ensure => directory,
           require => User[$user]
       }
@@ -38,7 +38,7 @@ define monkeysphere::authorized_user_ids(
     "${dest_dir}/${dest_file}":
       owner => $user,
       group => $calculated_group,
-      mode => 644,
+      mode => '644',
       content => template('monkeysphere/authorized_user_ids.erb'),
       ensure => present,
       recurse => true,
diff --git a/manifests/import_key.pp b/manifests/import_key.pp
index ba965ce..f3124bf 100644
--- a/manifests/import_key.pp
+++ b/manifests/import_key.pp
@@ -12,9 +12,9 @@ define monkeysphere::import_key (
 
   $key = "${scheme}${fqdn}${prefixed_port}"
 
-  exec { "monkeysphere-host import-key $path $key":
-    alias => "monkeysphere-import-key",
-    require => [ Package["monkeysphere"],  File["monkeysphere_host_conf"] ],
-    unless => "/usr/sbin/monkeysphere-host s | grep $key > /dev/null"
+  exec { "monkeysphere-import-key":
+    command => "monkeysphere-host import-key $path $key",
+    require => [ Package["monkeysphere"], File["monkeysphere_host_conf"] ],
+    unless  => "/usr/sbin/monkeysphere-host s | grep $key > /dev/null"
   }
 }
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'];