Adding discussion parameter and search support

diff --git a/manifests/init.pp b/manifests/init.pp
index 6fa41672ecb795d2a7a13148a456280de7312d04..8cef10e1df2038fdc3e0e68b560bb3c818af0c45 100644 (file)
--- 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 a0594651c421bdd36435c37a3ed062816f448dd0..c38084f4e195f27085af288beea0cd3ec878cd7e 100644 (file)
--- 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 75ceb49308539df700c060fca8a47fe622fca032..77b16a7c6708e9ca4bb8d8a35ed25b5c2fddcb21 100644 (file)
--- 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$/,