summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-03 16:25:04 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-03 16:25:04 +0200
commit427981c34a8522b4b8f75de4755f724e4120acfe (patch)
tree2670f6529fa3c1d7da880c0c4788ab71c91953c0
parent8473e1925a3f97edd8e18d4c04b86c034c46b0d8 (diff)
parent319fe0b566aedd3ae7671e36f8419ff1b2fdee44 (diff)
Merge branch '_clean' into allinone
Conflicts (manually resolved): ikiwiki.setup
-rw-r--r--ikiwiki.setup44
1 files changed, 18 insertions, 26 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index bfe9a43..f96a39d 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -6,20 +6,12 @@
#
# Remember to re-run ikiwiki --setup any time you edit this file.
-our $libdir;
-our $webdir;
-our $cgidir;
-our $gitdir;
-our $webhost;
-our $githost;
-our $gitrepo;
+our ($basedir, $builddir, $domain, $gitrepo);
BEGIN {
- $libdir = $ENV{'PWD'} . '/perl';
- $webdir = 'build/html';
- $cgidir = 'build/cgi';
- $gitdir = 'build/git';
- $webhost = 'wiki.example.org';
- $githost = 'git.example.org';
+ # git hook requires full path as basedir: $ENV{'HOME'} . '/mywiki'
+ $basedir = $ENV{'PWD'};
+ $builddir = $ENV{'BUILDDIR'} || $basedir . '/build';
+ $domain = 'example.org';
$gitrepo = 'wiki';
}
@@ -27,21 +19,21 @@ use IkiWiki::Setup::Standard {
# name of the wiki
wikiname => 'MyWiki',
# contact email for wiki
- #adminemail => 'me@example.org',
+ #adminemail => 'me@' . $domain,
# users who are wiki admins
adminuser => [],
# users who are banned from the wiki
banned_users => [],
# where the source of the wiki is located
- srcdir => 'content_dummy',
+ srcdir => $basedir . '/content_dummy',
# where to build the wiki
- destdir => $webdir,
+ destdir => $builddir . '/html',
# base url to the wiki
- url => 'http://' . $webhost . '/',
+ url => 'http://wiki.' . $domain . '/',
# url to the ikiwiki.cgi
- cgiurl => 'http://' . $webhost . '/ikiwiki.cgi',
+ cgiurl => 'http://wiki.' . $domain . '/ikiwiki.cgi',
# cgi wrapper to generate
- cgi_wrapper => $cgidir . '/ikiwiki.cgi',
+ cgi_wrapper => $builddir . '/cgi/ikiwiki.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '00755',
# rcs backend to use
@@ -54,12 +46,12 @@ use IkiWiki::Setup::Standard {
editpage
}],
# location of template files
- templatedir => 'templates',
+ templatedir => $basedir . '/templates',
# base wiki source location
underlaydirs => [
- 'content',
+ $basedir . '/content',
],
- underlaydir => 'basewiki',
+ underlaydir => $basedir . '/basewiki',
# display verbose messages when building?
#verbose => 1,
# log to syslog?
@@ -91,7 +83,7 @@ use IkiWiki::Setup::Standard {
# force ikiwiki to use a particular umask
#umask => 022,
# extra library and plugin directory
- libdir => $libdir,
+ libdir => $basedir . '/perl',
# environment variables
ENV => {},
# regexp of source files to ignore
@@ -147,13 +139,13 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- git_wrapper => $gitdir . '/post-update-ikiwiki',
+ git_wrapper => $builddir . '/git/post-update-ikiwiki',
# mode for git_wrapper (can safely be made suid)
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
+ #historyurl => 'http://source.' . $domain . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]]', # ;hb=master
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
- #diffurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+ #diffurl => 'http://source.' . $domain . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in