commit of setup files

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 41ef285290e2390f6bf52a5f1e0b2ad5182b3a96..1e209d57247ee419c6e313b75cd5e10b42c050ae 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -13,7 +13,7 @@ wikiname: ikiwiki
 adminemail: joey@kitenet.net
 # users who are wiki admins
 adminuser:
-  - http://none/
+  - http://joey.kitenet.net/
 # users who are banned from the wiki
 banned_users: []
 # where the source of the wiki is located
@@ -124,7 +124,7 @@ branchable: 1
 # Allow anyone to git push verified changes to this site?
 anonpush: 1
 # Display "Branchable" link on action bar?
-#branchable_action: 1
+branchable_action: 1
 
 # git plugin
 # git hook to generate
@@ -134,7 +134,7 @@ git_wrapper: /home/b-ikiwiki/source.git/hooks/post-update
 # mode for git_wrapper (can safely be made suid)
 git_wrappermode: 6755
 # git pre-receive hook to generate
-#git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive
+git_test_receive_wrapper: /home/b-ikiwiki/source.git/hooks/pre-receive
 # unix users whose commits should be checked by the pre-receive hook
 untrusted_committers:
   - ikiwiki-anon
@@ -143,9 +143,9 @@ historyurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=history;f=[[fi
 # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
 diffurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]'
 # where to pull and push changes (set to empty string to disable)
-#gitorigin_branch: origin
+gitorigin_branch: origin
 # branch that the wiki is stored in
-#gitmaster_branch: master
+gitmaster_branch: master
 
 # gitpush plugin
 # git repository urls that changes are pushed to
@@ -169,7 +169,7 @@ created: 1305836524
 # how many days to retain logs
 #log_period: 7
 # disable IPv6?
-#ipv6_disabled: 1
+ipv6_disabled: 0
 
 # inline plugin
 # enable rss feeds by default?
@@ -181,7 +181,7 @@ atom: 1
 # allow atom feeds to be used?
 #allowatom: 0
 # urls to ping (using XML-RPC) on feed update
-#pingurl: http://rpc.technorati.com/rpc/ping
+pingurl: []
 
 ######################################################################
 # auth plugins
@@ -237,9 +237,9 @@ openid_cgiurl: http://ikiwiki.branchable.com/ikiwiki.cgi
 # types of source files to syntax highlight
 tohighlight: .c .h .cpp .pl .py Makefile:make
 # location of highlight's filetypes.conf
-#filetypes_conf: /etc/highlight/filetypes.conf
+filetypes_conf: /etc/highlight/filetypes.conf
 # location of highlight's langDefs directory
-#langdefdir: /usr/share/highlight/langDefs
+langdefdir: /usr/share/highlight/langDefs
 
 # mdwn plugin
 # enable multimarkdown features?
@@ -300,12 +300,13 @@ virus_checker: clamdscan -
 
 # repolist plugin
 # URIs of repositories containing the wiki's source
-#repositories:
-#  - svn://svn.example.org/wiki/trunk
+repositories:
+  - ssh://b-ikiwiki@ikiwiki.branchable.com/
+  - git://ikiwiki.branchable.com/
 
 # search plugin
 # path to the omega cgi program
-#omega_cgi: /usr/lib/cgi-bin/omega/omega
+omega_cgi: /usr/lib/cgi-bin/omega/omega
 
 # theme plugin
 # name of theme to enable
@@ -347,7 +348,7 @@ websetup_show_unsafe: 0
 
 # listdirectives plugin
 # directory in srcdir that contains directive descriptions
-#directive_description_dir: ikiwiki/directive
+directive_description_dir: ikiwiki/directive
 
 # teximg plugin
 # Should teximg use dvipng to render, or dvips and convert?
@@ -408,9 +409,9 @@ websetup_show_unsafe: 0
 
 # recentchanges plugin
 # name of the recentchanges page
-#recentchangespage: recentchanges
+recentchangespage: recentchanges
 # number of changes to track
-#recentchangesnum: 100
+recentchangesnum: 100
 
 # rsync plugin
 # command to run to sync updated pages
@@ -426,7 +427,7 @@ websetup_show_unsafe: 0
 # autocreate new tag pages?
 #tag_autocreate: 1
 # commit autocreated tag pages
-#tag_autocreate_commit: 1
+tag_autocreate_commit: 1
 
 # typography plugin
 # Text::Typography attributes value