diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-01 10:14:30 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-01 10:14:30 +0200 |
| commit | a29d2720d0ddfdb7fe650083bf8218babc95c770 (patch) | |
| tree | b8689f8c8b7e093f944d49db9507ad81f7bf1fd9 | |
| parent | a60d6ca96bfb6611a0bd0eb648cd0ce097843f24 (diff) | |
| parent | 78c721ac0e377251eeb323d602aa66c77c0ffb59 (diff) | |
Merge branch '_multilang' into multilang
| -rw-r--r-- | ikiwiki_da.setup | 4 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 1e872c3..89fbcf4 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -45,7 +45,7 @@ use IkiWiki::Setup::Standard { # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use - rcs => '', + rcs => 'git', # plugins to add to the default configuration add_plugins => [qw{ }], @@ -145,7 +145,7 @@ use IkiWiki::Setup::Standard { # git hook to generate git_wrapper => $gitdir . '/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) - #git_wrappermode => '06755', + git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da', # gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index bf8247c..9a05bf3 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -45,7 +45,7 @@ use IkiWiki::Setup::Standard { # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use - rcs => '', + rcs => 'git', # plugins to add to the default configuration add_plugins => [qw{ }], @@ -145,7 +145,7 @@ use IkiWiki::Setup::Standard { # git hook to generate git_wrapper => $gitdir . '/post-update-ikiwiki-nb', # mode for git_wrapper (can safely be made suid) - #git_wrappermode => '06755', + git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-nb', # gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted) |