From deddeb6c9333caeaa09fc7ee3e24fb268faa79d5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 11 Apr 2013 18:45:51 -0300
Subject: Another major rewrite

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

(limited to 'manifests')

diff --git a/manifests/instance.pp b/manifests/instance.pp
index 8b4e13f..5dee2fd 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -10,7 +10,8 @@ define ikiwiki::instance(
                 $protocol                  = 'https',
                 $owner                     = $name,
                 $group                     = $name,
-                $home                      = "/home/$owner"
+                $home                      = "/home/$owner",
+                $create_ssh_key            = false
 ) {
 
   $desc = $description ? {
@@ -67,20 +68,22 @@ define ikiwiki::instance(
         }
       }
 
-      if !defined(File["${home}/.ssh"]) {
-        file { "${home}/.ssh":
-          ensure  => directory,
-          owner   => $owner,
-          group   => $group,
-          mode    => 0700,
+      if $create_ssh_key == true {
+        if !defined(File["${home}/.ssh"]) {
+          file { "${home}/.ssh":
+            ensure  => directory,
+            owner   => $owner,
+            group   => $group,
+            mode    => 0700,
+          }
         }
-      }
 
-      if !defined(File["${ikiwiki::sites_folder}/${name}"]) {
-        file { "${ikiwiki::sites_folder}/${name}":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
+        if !defined(File["${ikiwiki::sites_folder}/${name}"]) {
+          file { "${ikiwiki::sites_folder}/${name}":
+            ensure  => directory,
+            owner   => root,
+            group   => root,
+          }
         }
       }
 
-- 
cgit v1.2.3