diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:09 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:09 +0200 |
| commit | f9d65120175b66349d824f319aec3d0d3442af8e (patch) | |
| tree | e58445bfce86014ade93b334664612c445890dfe | |
| parent | d93b4e51c9711153ff7e7debdd9f38803e6ae67b (diff) | |
| parent | 5045a055d80c8d1147e893dbf59fd9590fd21318 (diff) | |
Merge branch '_multilang' into multilang
| -rw-r--r-- | ikiwiki.setup | 6 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index fd6cee4..a94c244 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -29,9 +29,11 @@ use IkiWiki::Setup::Standard { # rcs backend to use rcs => 'git', # plugins to add to the default configuration - add_plugins => [], + add_plugins => [qw{ + }], # plugins to disable - disable_plugins => [], + disable_plugins => [qw{ + }], # location of template files templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 008197b..68e51f8 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -123,7 +123,7 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da', + git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) #git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 182ba39..fcfe72b 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -123,7 +123,7 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb', + git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb', # mode for git_wrapper (can safely be made suid) #git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |