summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:10:02 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:10:02 +0200
commit3193f788b1f31c87040d59ca8915d31bb23deab5 (patch)
treeb24b07d6ae1b5b7ce9d7ba8657d36fb9287fcec5
parentda42773f4e4efc56f4233dbe5fb5d8070bf632fb (diff)
parent17e39c698233df61c6132a085a08b58952186a32 (diff)
Merge branch 'master' into _nb
Conflicts (manually resolved): ikiwiki_nb.setup
-rw-r--r--ikiwiki_nb.setup42
1 files changed, 30 insertions, 12 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 22189c9..7d8ceff 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -5,6 +5,24 @@
# wrappers and build the wiki.
#
# 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;
+BEGIN {
+ $libdir = $ENV{'PWD'} . '/perl';
+ $webdir = 'build/html';
+ $cgidir = 'build/cgi';
+ $gitdir = 'build/git';
+ $webhost = 'wiki.example.org';
+ $githost = 'git.example.org';
+ $gitrepo = 'wiki';
+}
+
use IkiWiki::Setup::Standard {
# name of the wiki
wikiname => 'MyWiki',
@@ -15,15 +33,15 @@ use IkiWiki::Setup::Standard {
# users who are banned from the wiki
banned_users => [],
# where the source of the wiki is located
- srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content',
+ srcdir => 'content',
# where to build the wiki
- destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
+ destdir => $webdir,
# base url to the wiki
- url => 'http://wiki.example.org',
+ url => 'http://' . $webhost . '/',
# url to the ikiwiki.cgi
- cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
+ cgiurl => 'http://' . $webhost . '/ikiwiki.cgi',
# cgi wrapper to generate
- cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
+ cgi_wrapper => $cgidir . '/ikiwiki.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '00755',
# rcs backend to use
@@ -35,9 +53,9 @@ use IkiWiki::Setup::Standard {
disable_plugins => [qw{
}],
# location of template files
- templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
+ templatedir => 'templates',
# base wiki source location
- underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki',
+ underlaydir => 'basewiki',
# display verbose messages when building?
#verbose => 1,
# log to syslog?
@@ -69,7 +87,7 @@ use IkiWiki::Setup::Standard {
# force ikiwiki to use a particular umask
#umask => 022,
# extra library and plugin directory
- libdir => $ENV{'HOME'} . '/private_webdata/samplewiki/perl',
+ libdir => $libdir,
# environment variables
ENV => {},
# regexp of source files to ignore
@@ -89,7 +107,7 @@ use IkiWiki::Setup::Standard {
# public access key id
#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
# file holding secret key (must not be readable by others!)
- #amazon_s3_key_id => $ENV{'HOME'} . '/secret_webdata/s3_key',
+ #amazon_s3_key_id => 's3_key',
# globally unique name of bucket to store wiki in
#amazon_s3_bucket => 'mywiki',
# a prefix to prepend to each page name
@@ -125,13 +143,13 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb',
+ git_wrapper => $gitdir . '/post-update-ikiwiki-nb',
# mode for git_wrapper (can safely be made suid)
git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
- #diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+ #diffurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.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