diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 01:07:39 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 01:07:39 +0200 |
| commit | ee222c059e5e3c68666bb9a60a491be6eba33943 (patch) | |
| tree | ad6cab0e1cac8e15f66e17ab36a2c4e94244ee5f | |
| parent | 7987513f80ca3bea93ceb9096fd765f40986d8c1 (diff) | |
| parent | bbe3b121170f6eeed8b77616452e04191f5b81a6 (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
| -rw-r--r-- | ikiwiki_nb_admin.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 367f34b..155fd10 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -16,7 +16,7 @@ use IkiWiki::Setup::Standard { url => "http://admin.example.org", cgiurl => "http://admin.wiki.example.org/ikiwiki.nb.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/nb", underlaydirs => [ #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", @@ -43,7 +43,7 @@ use IkiWiki::Setup::Standard { # # Note that this will overwrite any existing # # post-update hook script, which may not be # # what you want. - # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin", + # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb-admin", # wrappermode => "06755", #}, ], |