aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:07:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:07:34 -0300
commit6c62b9a66e1e09264b1f136cad31e7606aec1d5f (patch)
tree9a72a48ce24b16c6c8babe56313f4ce8d35a1890
parente89b91abb6c662579ee04929bf40d39a67600a2a (diff)
downloadpuppet-ikiwiki-6c62b9a66e1e09264b1f136cad31e7606aec1d5f.tar.gz
puppet-ikiwiki-6c62b9a66e1e09264b1f136cad31e7606aec1d5f.tar.bz2
Fix dependency for create_ssh_key
-rw-r--r--manifests/instance.pp16
1 files 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/