diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 12:38:05 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 12:38:05 +0200 |
| commit | eef5d621955a05ee72f63c83732900928f6be90d (patch) | |
| tree | 44a45c44efbe7cf7cc8659d73b414ff38f3c4d09 | |
| parent | 3b388d878a7a4bf4e47bd4f1a0440174541bc63c (diff) | |
| parent | 7d0d5f88ee5f12f0ae7ed872d783809fe34f22c0 (diff) | |
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved):
ikiwiki_da_admin.setup
| -rw-r--r-- | ikiwiki_da_admin.setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index ccdf787..c6df093 100644 --- a/ikiwiki_da_admin.setup +++ b/ikiwiki_da_admin.setup @@ -14,8 +14,8 @@ use IkiWiki::Setup::Standard { srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content", destdir => $ENV{'HOME'} . "/public_websites/admin.example.org", - url => "http://wiki.example.org", - cgiurl => "http://wiki.example.org/ikiwiki.cgi", + url => "http://admin.example.org", + cgiurl => "http://admin.example.org/ikiwiki.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/da", underlaydirs => [ #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", @@ -35,7 +35,7 @@ use IkiWiki::Setup::Standard { #{ # # The cgi wrapper. # cgi => 1, - # wrapper => $ENV{'HOME'} . "/public_cgi/wiki.example.org/ikiwiki.cgi", + # wrapper => $ENV{'HOME'} . "/public_cgi/admin.example.org/ikiwiki.cgi", # wrappermode => "06755", #}, #{ |