Merge branch '_multilang' into allinone-multilang

Conflicts (manually resolved):
	ikiwiki_da.setup
	ikiwiki_nb.setup

3 files changed, 35 insertions, 16 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 6a18fa4..b7124ee 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -151,9 +151,9 @@ use IkiWiki::Setup::Standard {
 	# 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=wiki.git;a=history;f=[[file]]', # ;hb=master
+	#historyurl => 'http://' . $githost . '/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=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	#diffurl => 'http://' . $githost . '/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
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup
index 52a36fd..1a498b3 100644
--- a/ikiwiki_da.setup
+++ b/ikiwiki_da.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',
@@ -17,30 +35,30 @@ use IkiWiki::Setup::Standard {
 	# where the source of the wiki is located
 	srcdir => 'content_dummy_da',
 	# 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.da.cgi',
+	cgiurl => 'http://' . $webhost . '/ikiwiki.da.cgi',
 	# cgi wrapper to generate
-	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.da.cgi',
+	cgi_wrapper => $cgidir . '/ikiwiki.da.cgi',
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '00755',
 	# rcs backend to use
 	rcs => 'git',
 	# plugins to add to the default configuration
-	add_plugins => [],
+	add_plugins => [qw{
+		}],
 	# plugins to disable
 	disable_plugins => [qw{
 		editpage
 		}],
 	# location of template files
-	templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da',
+	templatedir => 'templates_da',
 	# base wiki source location
 	underlaydirs => [
 		'content_da',
 		],
-	# Some plugins (smiley in particular) need non-localized master underlay
 	underlaydir => 'basewiki_da',
 	# display verbose messages when building?
 	#verbose => 1,
@@ -73,7 +91,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
@@ -93,7 +111,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
@@ -133,9 +151,9 @@ use IkiWiki::Setup::Standard {
 	# 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=wiki.git;a=history;f=[[file]];hb=master-da',
+	#historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da',
 	# 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=' . $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
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 8b7918e..e887979 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -47,7 +47,8 @@ use IkiWiki::Setup::Standard {
 	# rcs backend to use
 	rcs => 'git',
 	# plugins to add to the default configuration
-	add_plugins => [],
+	add_plugins => [qw{
+		}],
 	# plugins to disable
 	disable_plugins => [qw{
 		editpage
@@ -150,9 +151,9 @@ use IkiWiki::Setup::Standard {
 	# 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=wiki.git;a=history;f=[[file]];hb=master-nb',
+	#historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-nb',
 	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
-	#diffurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	#diffurl => 'http://' . $githost . '/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