diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-31 20:09:33 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-31 20:09:33 -0200 |
| commit | 93d2d49567c3ae12db96526650cdc6459d21d62d (patch) | |
| tree | 2ec6ecc25a885ddaa8d29626ffa5371b8a90854b | |
| parent | 6717b36af2e08b24e33a8af836ec7afa9d23819d (diff) | |
| download | puppet-ikiwiki-93d2d49567c3ae12db96526650cdc6459d21d62d.tar.gz puppet-ikiwiki-93d2d49567c3ae12db96526650cdc6459d21d62d.tar.bz2 | |
Adding parameters $account_creation_password, $add_plugins and $disable_plugins
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 2c692ea..af7795c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,7 +24,8 @@ class ikiwiki { } define instance($base_url = false, $ensure = 'present', $description = false, - $adminuser = 'yourname', $adminemail = 'me@example.org', $instance = 'ikiwiki') { + $adminuser = 'yourname', $adminemail = 'me@example.org', $instance = 'ikiwiki', + $account_creation_password = false, $add_plugins = false, $disable_plugins = false) { $desc = $description ? { false => $title, diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index 1bf684d..786dcbe 100644 --- a/templates/ikiwiki.setup.erb +++ b/templates/ikiwiki.setup.erb @@ -124,7 +124,7 @@ use IkiWiki::Setup::Standard { # To create output files named page.html rather than page/index.html. #usedirs => 0, # Simple spam prevention: require an account-creation password. - #account_creation_password => "example", +<%= if account_creation_password != false %> account_creation_password => "<%= account_creation_password %>",<%= end %> # Cost of generating a password using Authen::Passphrase::BlowfishCrypt #password_cost => 8, # Uncomment to force ikiwiki to run with a particular umask. @@ -143,9 +143,10 @@ use IkiWiki::Setup::Standard { # To add plugins, list them here. #add_plugins => [qw{goodstuff search wikitext camelcase # htmltidy fortune sidebar map rst anonok}], +<%= if add_plugins != false %> add_plugins => [qw{<%= add_plugins %>}],<%= end %> # If you want to disable any of the default plugins, list them here. #disable_plugins => [qw{inline htmlscrubber passwordauth openid}], - disable_plugins => [qw{openid}], +<%= if disable_plugins != false %> disable_plugins => [qw{<%= disable_plugins %>}],<%= end %> # To add a directory to the perl search path, use this. #libdir => "/home/me/.ikiwiki/", |