Mise à jour de la configuration

Activation des plugins recentchanges et git.

diff --git a/ikiwiki.setup b/ikiwiki.setup
index a70b0f62a98a2af6c9cb7668fcafc4d609646a3e..30b4b69d2e163c3efc8748e8427bd2a6bb34d2c8 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -28,12 +28,13 @@ cgi_wrapper: ''
 # mode for cgi_wrapper (can safely be made suid)
 cgi_wrappermode: '06755'
 # rcs backend to use
-rcs: ''
+rcs: git
 # plugins to add to the default configuration
 add_plugins:
 - html
 - img
 - po
+- recentchanges
 - sidebar
 # plugins to disable
 disable_plugins: []
@@ -46,19 +47,19 @@ underlaydir: /usr/share/ikiwiki/basewiki
 # log to syslog?
 #syslog: 1
 # create output files named page/index.html?
-usedirs: 1
+usedirs: '1'
 # use '!'-prefixed preprocessor directives?
-prefix_directives: 1
+prefix_directives: '1'
 # use page/index.mdwn source files
-indexpages: 0
+indexpages: '0'
 # enable Discussion pages?
-discussion: 1
+discussion: '1'
 # name of Discussion pages
 discussionpage: Discussion
 # generate HTML5?
-html5: 0
+html5: '0'
 # only send cookies over SSL connections?
-sslcookie: 0
+sslcookie: '0'
 # extension to use for new pages
 default_pageext: mdwn
 # extension to use for html files
@@ -70,9 +71,9 @@ locale: fr-FR.UTF-8
 # put user pages below specified page
 userdir: ''
 # how many backlinks to show before hiding excess (0 to show all)
-numbacklinks: 10
+numbacklinks: '10'
 # attempt to hardlink source files? (optimisation for large files)
-hardlink: 0
+hardlink: '0'
 # force ikiwiki to use a particular umask (keywords public, group or private, or a number)
 #umask: public
 # group for wrappers to run in
@@ -90,13 +91,33 @@ ENV: {}
 # specifies the characters that are allowed in source filenames
 wiki_file_chars: -[:alnum:]+/.:_
 # allow symlinks in the path leading to the srcdir (potentially insecure)
-allow_symlinks_before_srcdir: 0
+allow_symlinks_before_srcdir: '0'
 
 ######################################################################
 # core plugins
-#   (editpage, htmlscrubber, inline, link, meta, parentlinks)
+#   (editpage, git, htmlscrubber, inline, link, meta, parentlinks)
 ######################################################################
 
+# git plugin
+# git hook to generate
+#git_wrapper: /git/wiki.git/hooks/post-update
+# shell command for git_wrapper to run, in the background
+#git_wrapper_background_command: git push github
+# mode for git_wrapper (can safely be made suid)
+#git_wrappermode: '06755'
+# git pre-receive hook to generate
+#git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive
+# unix users whose commits should be checked by the pre-receive hook
+#untrusted_committers: []
+# gitweb url to show file history ([[file]] substituted)
+#historyurl: http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=HEAD
+# gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
+#diffurl: http://git.example.com/gitweb.cgi?p=wiki.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: ''
+# branch that the wiki is stored in
+gitmaster_branch: master
+
 # htmlscrubber plugin
 # PageSpec specifying pages not to scrub
 #htmlscrubber_skip: '!*/Discussion'
@@ -107,9 +128,9 @@ allow_symlinks_before_srcdir: 0
 # enable atom feeds by default?
 #atom: 0
 # allow rss feeds to be used?
-#allowrss: 0
+allowrss: '1'
 # allow atom feeds to be used?
-#allowatom: 0
+allowatom: '1'
 # urls to ping (using XML-RPC) on feed update
 pingurl: []
 
@@ -183,13 +204,10 @@ po_master_language: fr|French
 # slave languages (translated via PO files) format: ll|Langname
 po_slave_languages:
 - en|English
-#- fr|Français
-#- es|Español
-#- de|Deutsch
 # PageSpec controlling which pages are translatable
-po_translatable_pages: 'À_propos or Donnez or Contact'
+po_translatable_pages: À_propos or Donnez or Contact
 # internal linking behavior (default/current/negotiated)
-#po_link_to: current
+po_link_to: default
 
 ######################################################################
 # special-purpose plugins
@@ -349,7 +367,7 @@ po_translatable_pages: 'À_propos or Donnez or Contact'
 # name of the recentchanges page
 recentchangespage: recentchanges
 # number of changes to track
-recentchangesnum: 100
+recentchangesnum: '100'
 
 # rsync plugin
 # command to run to sync updated pages