Adapt ikiwiki.setup paths to common usage.

1 files changed, 16 insertions, 16 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 4441f0d..bbf81bf 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -9,21 +9,21 @@ use IkiWiki::Setup::Standard {
 	# name of the wiki
 	wikiname => 'wiki',
 	# contact email for wiki
-	#adminemail => 'me@example.com',
+	#adminemail => 'me@example.org',
 	# users who are wiki admins
 	adminuser => [],
 	# users who are banned from the wiki
 	banned_users => [],
 	# where the source of the wiki is located
-	#srcdir => '/home/me/wiki',
+	srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content',
 	# where to build the wiki
-	destdir => '',
+	destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
 	# base url to the wiki
-	url => '',
+	url => 'http://wiki.example.org',
 	# url to the ikiwiki.cgi
-	cgiurl => '',
+	cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
 	# cgi wrapper to generate
-	cgi_wrapper => '',
+	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '06755',
 	# rcs backend to use
@@ -33,9 +33,9 @@ use IkiWiki::Setup::Standard {
 	# plugins to disable
 	disable_plugins => [],
 	# location of template files
-	templatedir => '/usr/share/ikiwiki/templates',
+	templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
 	# base wiki source location
-	underlaydir => '/usr/share/ikiwiki/basewiki',
+	underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki',
 	# display verbose messages when building?
 	#verbose => 1,
 	# log to syslog?
@@ -67,7 +67,7 @@ use IkiWiki::Setup::Standard {
 	# force ikiwiki to use a particular umask
 	#umask => 022,
 	# extra library and plugin directory
-	libdir => '.',
+	libdir => 'perl',
 	# environment variables
 	ENV => {},
 	# regexp of source files to ignore
@@ -87,7 +87,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 => '/home/me/.s3_key',
+	#amazon_s3_key_id => $ENV{'HOME'} . '/secret_webdata/s3_key',
 	# globally unique name of bucket to store wiki in
 	#amazon_s3_bucket => 'mywiki',
 	# a prefix to prepend to each page name
@@ -115,7 +115,7 @@ use IkiWiki::Setup::Standard {
 	# url to show file history, using loggerhead ([[file]] substituted)
 	#historyurl => '',
 	# url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
-	#diffurl => 'http://example.com/revision?start_revid=[[r2]]#[[file]]-s',
+	#diffurl => 'http://example.org/revision?start_revid=[[r2]]#[[file]]-s',
 
 	# calendar plugin
 	# base of the archives hierarchy
@@ -123,15 +123,15 @@ use IkiWiki::Setup::Standard {
 
 	# git plugin
 	# git hook to generate
-	#git_wrapper => '/git/wiki.git/hooks/post-update',
+	#git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update',
 	# mode for git_wrapper (can safely be made suid)
 	#git_wrappermode => '06755',
 	# gitweb url to show file history ([[file]] substituted)
-	#historyurl => 'http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]',
+	#historyurl => 'http://git.example.org/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.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	#diffurl => 'http://git.example.org/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 => 'origin',
+	#gitorigin_branch => 'samplewiki',
 	# branch that the wiki is stored in
 	#gitmaster_branch => 'master',
 
@@ -169,7 +169,7 @@ use IkiWiki::Setup::Standard {
 	# 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.com:8000/log/tip/[[file]]',
+	#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]]',