From 6c62b9a66e1e09264b1f136cad31e7606aec1d5f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 11 Apr 2013 19:07:34 -0300
Subject: Fix dependency for create_ssh_key

---
 manifests/instance.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/instance.pp b/manifests/instance.pp
index c6d0e63..c7648da 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -39,14 +39,6 @@ define ikiwiki::instance(
         refreshonly => true,
       }
 
-      exec { "ssh-keygen-ikiwiki-${owner}":
-        command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/id_rsa",
-        creates => "${home}/.ssh/id_rsa",
-        user    => $owner,
-        group   => $group,
-        require => File["${home}/.ssh"],
-      }
-
       if !defined(File["${ikiwiki::sites_folder}/${name}"]) {
         file { "${ikiwiki::sites_folder}/${name}":
           ensure  => directory,
@@ -92,6 +84,14 @@ define ikiwiki::instance(
             group   => root,
           }
         }
+
+        exec { "ssh-keygen-ikiwiki-${owner}":
+          command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/id_rsa",
+          creates => "${home}/.ssh/id_rsa",
+          user    => $owner,
+          group   => $group,
+          require => File["${home}/.ssh"],
+        }
       }
 
       # See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/
-- 
cgit v1.2.3