diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-10-03 15:01:35 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-10-03 15:01:35 -0300 |
| commit | c2bb38ff5ad51794a7c53b6c11478022c0670677 (patch) | |
| tree | d6cd4d23387265fb307bfc6d18cd7278eb8f83b1 | |
| parent | 6872c12233cda9e6e58dceedbb118ea30c655c63 (diff) | |
| download | puppet-ikiwiki-c2bb38ff5ad51794a7c53b6c11478022c0670677.tar.gz puppet-ikiwiki-c2bb38ff5ad51794a7c53b6c11478022c0670677.tar.bz2 | |
Adding discussion parameter and search support
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| -rw-r--r-- | manifests/instance.pp | 1 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 2 |
3 files changed, 8 insertions, 1 deletions
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$/, |