ensure config files are in place before executing monkeysphere commands

diff --git a/manifests/init.pp b/manifests/init.pp
index 7ecf5a180b1430991f01dff51c5d7bece76022bd..c25e1f72b022afd0f76c48f4fff2028f0a728daa 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,20 +24,20 @@ class monkeysphere inherits monkeysphere::defaults {
   # The needed packages
   package { monkeysphere: ensure => installed, }
 
-  file {
-    "/etc/monkeysphere/monkeysphere.conf":
+  file { "monkeysphere_conf":
+    path => "/etc/monkeysphere/monkeysphere.conf",
     mode => 644,
     ensure => present,
     content => template("monkeysphere/monkeysphere.conf.erb"),
   }
-  file {
-    "/etc/monkeysphere/monkeysphere-host.conf":
+  file { "monkeysphere_host_conf":
+    path => "/etc/monkeysphere/monkeysphere-host.conf",
     mode => 644,
     ensure => present,
     content => template("monkeysphere/monkeysphere-host.conf.erb"),
   }
-  file {
-    "/etc/monkeysphere/monkeysphere-authentication.conf":
+  file { "monkeysphere_authentication_conf":
+    path => "/etc/monkeysphere/monkeysphere-authentication.conf",
     mode => 644,
     ensure => present,
     content => template("monkeysphere/monkeysphere-authentication.conf.erb"),
@@ -59,11 +59,11 @@ define monkeysphere::import_key ( $scheme = 'ssh://', $port = '', $path = '/etc/
     default => ":$port"
   }
 
-  $key = "${schema}://${fqdn}${prefixed_port}"
+  $key = "${scheme}${fqdn}${prefixed_port}"
 
   exec { "monkeysphere-host import-key $path $key":
     alias => "monkeysphere-import-key",
-         require => [ Package["monkeysphere"] ],
+         require => [ Package["monkeysphere"],  File["monkeysphere_host_conf"] ],
          unless => "/usr/sbin/monkeysphere-host s | grep $key > /dev/null"
   }
 }
@@ -72,7 +72,7 @@ define monkeysphere::import_key ( $scheme = 'ssh://', $port = '', $path = '/etc/
 define monkeysphere::publish_keys ( $keyid = '--all' ) { 
   exec { "monkeysphere-host publish-keys $keyid":
     environment => "MONKEYSPHERE_PROMPT=false",
-         require => [ Package["monkeysphere"], Exec["monkeysphere-import-key"] ],
+         require => [ Package["monkeysphere"], Exec["monkeysphere-import-key"], File["monkeysphere_host_conf"] ],
   }
 }
 
@@ -87,23 +87,29 @@ define monkeysphere::email_keys ( $email = 'root'  ) {
 define monkeysphere::add_id_certifier( $keyid ) {
   exec { "monkeysphere-authentication add-id-certifier $keyid":
          environment => "MONKEYSPHERE_PROMPT=false",
-         require => [ Package["monkeysphere"] ],
+         require => [ Package["monkeysphere"], File["monkeysphere_authentication_conf"] ],
          unless => "/usr/sbin/monkeysphere-authentication list-id-certifiers | grep $keyid > /dev/null"
   }
 }
 
-define monkeysphere::authorized_user_ids( $source, $user = 'root', $group = $user, $dest_dir = '/root/.monkeysphere', $dest_file = '.authorized_user_ids') {
+define monkeysphere::authorized_user_ids( $source,  $dest_dir = '/root/.monkeysphere', $dest_file = '.authorized_user_ids', $group = '') {
+  $user = $title
+  $calculated_group = $group ? {
+    '' => $user,
+    default => $group
+  }
+
   file {
     $dest_dir:
       owner => $user,
-      group => $group,
+      group => $calculated_group,
       mode => 755,
       ensure => directory,
   }
   file {
     "${dest_dir}/${dest_file}":
       owner => $user,
-      group => $group,
+      group => $calculated_group,
       mode => 644,
       source => $source,
       ensure => present,
@@ -111,8 +117,8 @@ define monkeysphere::authorized_user_ids( $source, $user = 'root', $group = $use
   }
 
   exec { "monkeysphere-authentication update-users $user":
-         require => [ Package["monkeysphere"] ],
     refreshonly => true,
+    require => [ File["monkeysphere_authentication_conf"], Package["monkeysphere"] ],
     subscribe => File["${dest_dir}/${dest_file}"] 
   }
 }