Adding parameters $account_creation_password, $add_plugins and $disable_plugins

diff --git a/manifests/init.pp b/manifests/init.pp
index 2c692ea29299657fa9f83132265724fb16b6d9e4..af7795ca50ea7e6109b207e6ff1771bc6f3d85d0 100644 (file)
--- 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 1bf684d52e57c394a9294762ec0749ab4896f189..786dcbee109a05b1aebece033bd5f881d41513ae 100644 (file)
--- 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/",