Cleanup ikiwiki config

diff --git a/ikiwiki.setup b/ikiwiki.setup
index bb6d2e3bfe61f5a80b4521ef2c4580b115f97669..bb20644000b8d64423d05ae7dfdd2ff5e95e045c 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,40 +1,25 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
-# build the wiki.
-#
-# Remember to re-run ikiwiki --setup any time you edit this file.
-
 use IkiWiki::Setup::Standard {
-  wikiname => "cypherprank machine",
-  adminuser => ["rhatto", ],
+  # Basic
+  wikiname   => "cypherprank machine",
+  adminuser  => ["rhatto", ],
   adminemail => 'rhatto@riseup.net',
+  srcdir     => ".",
+  destdir    => "www",
+  url        => "https://blog.fluxo.info",
+  cgiurl     => "https://blog.fluxo.info/ikiwiki.cgi",
 
-  srcdir => ".",
-  destdir => "www",
-
-  url => "https://blog.fluxo.info",
-  cgiurl => "https://blog.fluxo.info/ikiwiki.cgi",
-
-  # Git stuff.
-  rcs => "git",
-  historyurl => "https://git.fluxo.info/blog/log/[[file]]",
-  diffurl => 'https://git.fluxo.info/blog/commit/[[file]]?id=[[sha1_commit]]',
+  # Git stuff
   # See https://ikiwiki.info/tips/laptop_wiki_with_git/
+  rcs              => "git",
+  historyurl       => "https://git.fluxo.info/blog/log/[[file]]",
+  diffurl          => 'https://git.fluxo.info/blog/commit/[[file]]?id=[[sha1_commit]]',
   gitorigin_branch => '',
 
-  wrappers => [ ],
-
-  # Default to generating rss feeds for pages with feeds?
-  rss => 1,
-  # Default to generating atom feeds for pages with feeds?
-  #atom => 1,
-  # Allow generating feeds even if not generated by default?
-  #allowrss => 1,
-  #allowatom => 1,
-  # Urls to ping with XML-RPC when feeds are updated
-  #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
-  # Include discussion links on all pages?
+  # Misc
+  wrappers   => [ ],
+  rss        => 1,
   discussion => 0,
 
   # To exclude files matching a regexp from processing. This adds to
@@ -56,6 +41,6 @@ use IkiWiki::Setup::Standard {
   umask => 002,
 
   # To add or disable plugins, list them here.
-  add_plugins => [qw{goodstuff sidebar}],
+  add_plugins     => [qw{goodstuff sidebar}],
   disable_plugins => [qw{openid editpage}],
 }