From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 10 Apr 2013 19:15:19 +0000 (-0300)
Subject: Make sure that .ssh folder exists
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6e8d73eb57d818bd441414c4b98a10fbf1ef1d56;p=puppet-ikiwiki.git

Make sure that .ssh folder exists
---

diff --git a/manifests/instance.pp b/manifests/instance.pp
index d797f2e..ba0db0d 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -30,6 +30,7 @@ define ikiwiki::instance($base_url = $domain, $ensure = 'present', $description
         creates => "${ikiwiki::sites_folder}/${name}/.ssh/id_rsa",
         user    => $owner,
         group   => $group,
+        require => File["${ikiwiki::sites_folder}/${name}/.ssh"],
       }
 
       if !defined(File["${ikiwiki::sites_folder}/${name}/${instance}_src"]) {
@@ -53,6 +54,16 @@ define ikiwiki::instance($base_url = $domain, $ensure = 'present', $description
         }
       }
 
+      if !defined(File["${ikiwiki::sites_folder}/${name}/.ssh"]) {
+        file { "${ikiwiki::sites_folder}/${name}/.ssh":
+          ensure  => directory,
+          owner   => $owner,
+          group   => $group,
+          mode    => 0700,
+          require => File["${ikiwiki::sites_folder}/${name}"],
+        }
+      }
+
       if !defined(File["${ikiwiki::sites_folder}/${name}"]) {
         file { "${ikiwiki::sites_folder}/${name}":
           ensure  => directory,