From c2bb38ff5ad51794a7c53b6c11478022c0670677 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 3 Oct 2013 15:01:35 -0300
Subject: Adding discussion parameter and search support

---
 manifests/init.pp           | 6 ++++++
 manifests/instance.pp       | 1 +
 templates/ikiwiki.setup.erb | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6fa4167..8cef10e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,6 +8,12 @@ class ikiwiki(
     ensure => installed,
   }
 
+  # Search support
+  # http://ikiwiki.info/plugins/search/
+  package { [ 'libsearch-xapian-perl', 'libdigest-sha-perl', 'libhtml-scrubber-perl' ]:
+    ensure => present,
+  }
+
   file { "/usr/local/sbin/ikiwiki-deploy":
     ensure  => present,
     content => template('ikiwiki/deploy.sh.erb'),
diff --git a/manifests/instance.pp b/manifests/instance.pp
index a059465..c38084f 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -11,6 +11,7 @@ define ikiwiki::instance(
   $owner                     = $name,
   $group                     = $name,
   $cgi                       = '1',
+  $discussion                = '1',
 ) {
   case $ensure {
     'present': {
diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index 75ceb49..77b16a7 100644
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -104,7 +104,7 @@ use IkiWiki::Setup::Standard {
 	# Urls to ping with XML-RPC when feeds are updated
 	#pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
 	# Include discussion links on all pages?
-	discussion => 1,
+	discussion => <%= discussion %>,
 	# To exclude files matching a regexp from processing. This adds to
 	# the default exclude list.
 	#exclude => qr/\.wav$/,
-- 
cgit v1.2.3