More cleanup

diff --git a/manifests/instance.pp b/manifests/instance.pp
index 6ff04433ac7bb6612d41cc8bb6a3d89b67e4f20f..bd46af7b2a1759d2d506d154e81a631e8cf2499b 100644 (file)
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -1,7 +1,7 @@
 define ikiwiki::instance(
   $ensure                    = 'present',
   $base_url                  = $domain,
-  $description               = false,
+  $description               = $title,
   $adminuser                 = 'yourname',
   $adminemail                = 'me@example.org',
   $account_creation_password = false,
@@ -14,14 +14,6 @@ define ikiwiki::instance(
   $create_ssh_key            = false
 ) {
 
-  $desc = $description ? {
-    false   => $title,
-    default => $description,
-  }
-
-  # This was previously a parameter
-  $instance = 'ikiwiki'
-
   case $ensure {
     'present': {
       file { "/etc/ikiwiki/$name.setup":
@@ -48,8 +40,8 @@ define ikiwiki::instance(
         }
       }
 
-      if !defined(File["${ikiwiki::sites_folder}/${name}/${instance}"]) {
-        file { "${ikiwiki::sites_folder}/${name}/${instance}":
+      if !defined(File["${ikiwiki::sites_folder}/${name}/ikiwiki"]) {
+        file { "${ikiwiki::sites_folder}/${name}/ikiwiki":
           ensure  => directory,
           owner   => $owner,
           group   => $group,
@@ -58,7 +50,7 @@ define ikiwiki::instance(
         }
       }
 
-      file { "${ikiwiki::sites_folder}/${name}/${instance}_src":
+      file { "${ikiwiki::sites_folder}/${name}/ikiwiki_src":
         ensure  => directory,
         owner   => $owner,
         group   => $group,
@@ -103,7 +95,7 @@ define ikiwiki::instance(
         require => File["/etc/ikiwiki/$name.setup"],
       }
 
-      file { "${ikiwiki::sites_folder}/${name}/${instance}/ikiwiki.cgi":
+      file { "${ikiwiki::sites_folder}/${name}/ikiwiki/ikiwiki.cgi":
         ensure  => present,
         owner   => $owner,
         group   => $ikiwiki::www_user,

diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index f66186663e5aa2e8ad6513752d92d315d0415317..986eb3a471818e7daf0c0d8a025f4f4dfc6bdd64 100644 (file)
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -6,7 +6,7 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
-  wikiname => "<%= desc %>",
+  wikiname => "<%= description %>",
   adminuser => ["<%= adminuser %>", ],
   adminemail => '<%= adminemail %>',