aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/instance.pp18
-rw-r--r--templates/ikiwiki.setup.erb2
2 files changed, 6 insertions, 14 deletions
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 6ff0443..bd46af7 100644
--- 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 f661866..986eb3a 100644
--- 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 %>',