summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-10-04 16:32:05 +0200
committerJonas Smedegaard <dr@jones.dk>2010-10-04 16:32:05 +0200
commit59c7ee48ba8045972971dcf33c772622b0fc9fbb (patch)
tree0b3226e04c64d4ec90a0713f6060793afab700b5
parent6e1efac5c3ea676d2154dd3cb7d6e8bac009e22e (diff)
parentd069a87a00e34f77748ed09f497bdf06f5fe906d (diff)
Merge branch 'master' into _nb
-rw-r--r--ikiwiki_nb.setup46
1 files changed, 1 insertions, 45 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index ce56998..85dd512 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -9,7 +9,7 @@
our ($basedir, $builddir, $domain, $gitrepo);
BEGIN {
# git hook requires full path as basedir: $ENV{'HOME'} . '/mywiki'
- $basedir = $ENV{'PWD'};
+ $basedir = $ENV{'SRCDIR'} || $ENV{'PWD'};
$builddir = $ENV{'BUILDDIR'} || $basedir . '/build';
$domain = 'example.org';
$gitrepo = 'wiki';
@@ -119,16 +119,6 @@ use IkiWiki::Setup::Standard {
# virus checker program (reads STDIN, returns nonzero if virus found)
#virus_checker => 'clamdscan -',
- # bzr plugin
- # bzr post-commit hook to generate
- #bzr_wrapper => '',
- # mode for bzr_wrapper (can safely be made suid)
- #bzr_wrappermode => '06755',
- # url to show file history, using loggerhead ([[file]] substituted)
- #historyurl => '',
- # url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
- #diffurl => 'http://example.org/revision?start_revid=[[r2]]#[[file]]-s',
-
# calendar plugin
# base of the archives hierarchy
#archivebase => 'archives',
@@ -175,16 +165,6 @@ use IkiWiki::Setup::Standard {
# enable multimarkdown features?
#multimarkdown => 0,
- # mercurial plugin
- # mercurial post-commit hook to generate
- #mercurial_wrapper => '',
- # mode for mercurial_wrapper (can safely be made suid)
- #mercurial_wrappermode => '06755',
- # url to hg serve'd repository, to show file history ([[file]] substituted)
- #historyurl => 'http://example.org:8000/log/tip/[[file]]',
- # url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)
- #diffurl => 'http://localhost:8000/?fd=[[r2]];file=[[file]]',
-
# mirrorlist plugin
# list of mirrors
#mirrorlist => {},
@@ -217,20 +197,6 @@ use IkiWiki::Setup::Standard {
# path to the omega cgi program
#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
- # svn plugin
- # subversion repository location
- #svnrepo => '/svn/wiki',
- # path inside repository where the wiki is located
- #svnpath => 'trunk',
- # svn post-commit hook to generate
- #svn_wrapper => '/svn/wikirepo/hooks/post-commit',
- # mode for svn_wrapper (can safely be made suid)
- #svn_wrappermode => '04755',
- # viewvc url to show file history ([[file]] substituted)
- #historyurl => 'http://svn.example.org/trunk/[[file]]',
- # viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)
- #diffurl => 'http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]',
-
# tag plugin
# parent page tags are located under
#tagbase => 'tag',
@@ -249,16 +215,6 @@ use IkiWiki::Setup::Standard {
# LaTeX postfix for teximg plugin
#teximg_postfix => '\\end{document}',
- # tla plugin
- # tla post-commit hook to generate
- #tla_wrapper => '',
- # mode for tla_wrapper (can safely be made suid)
- #tla_wrappermode => '06755',
- # url to show file history ([[file]] substituted)
- #historyurl => '',
- # url to show a diff ([[file]] and [[rev]] substituted)
- #diffurl => '',
-
# typography plugin
# Text::Typography attributes value
#typographyattributes => '3',