Adding parameters $description, $adminuser, $adminemail and $instance

1 files changed, 21 insertions, 7 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index c024e3e..b2ec307 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,7 +15,13 @@ class ikiwiki {
     mode    => 755,
   }
 
-  define instance($base_url = false, $ensure = 'present') {
+  define instance($base_url = false, $ensure = 'present', $description = false,
+                  $adminuser = 'yourname', $adminemail = 'me@example.org', $instance = 'ikiwiki') {
+
+    $desc = $decription ? {
+      false   => $name,
+      default => $description,
+    }
 
     $ikiwiki_base = $base_url ? {
       false   => $domain,
@@ -38,13 +44,13 @@ class ikiwiki {
           refreshonly => true,
         }
     
-        exec { "/usr/local/sbin/ikiwiki-deploy $name":
-          unless  => "/bin/sh -c '[ -f ${apache_sites_folder}/${name}/ikiwiki_src/index.mdw ]'",
+        exec { "/usr/local/sbin/ikiwiki-deploy $name $instance":
+          unless  => "/bin/sh -c '[ -f ${apache_sites_folder}/${name}/${instance}_src/index.mdw ]'",
           user    => root,
         }
     
-        if !defined(File["${apache_sites_folder}/${name}/ikiwiki_src"]) {
-          file { "${apache_sites_folder}/${name}/ikiwiki_src":
+        if !defined(File["${apache_sites_folder}/${name}/${instance}_src"]) {
+          file { "${apache_sites_folder}/${name}/${instance}_src":
             ensure  => directory,
             owner   => gitosis,
             group   => gitosis,
@@ -54,8 +60,8 @@ class ikiwiki {
           }
         }
 
-        if !defined(File["${apache_sites_folder}/${name}/ikiwiki"]) {
-          file { "${apache_sites_folder}/${name}/ikiwiki":
+        if !defined(File["${apache_sites_folder}/${name}/${instance}"]) {
+          file { "${apache_sites_folder}/${name}/${instance}":
             ensure  => directory,
             owner   => gitosis,
             group   => gitosis,
@@ -71,6 +77,14 @@ class ikiwiki {
             group   => root,
           }
         }
+
+       file { "${apache_sites_folder}/${name}/${instance}_src/.ikiwiki":
+         ensure  => directory,
+         owner   => www-data,
+         group   => www-data,
+         recurse => true,
+         require => File["${apache_sites_folder}/${name}/${instance}_src"],
+       }
       }
     }
   }