Makefile: use ikiwiki.setup

diff --git a/Makefile b/Makefile
index 9f65366f9365c16d6e14b5b2ddadd89c6450e3c9..a36d227cd3d313b0642f83b954d68e5bf4e3176d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 #
 
 wiki:
-       @ikiwiki --rebuild --exclude www . www
+       @ikiwiki --setup ikiwiki.setup
 
 deploy:
        @rsync -avz --delete www/ blog:/var/sites/rhatto/www/

diff --git a/ikiwiki.setup b/ikiwiki.setup
index aba3e5149cbafd95aead2f203a2d1ce2ffff8b88..f899283bb14b83fccd781f2f24ed9aaa1f6be99e 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -11,8 +11,8 @@ use IkiWiki::Setup::Standard {
   adminemail => 'rhatto@riseup.net',
 
        # Be sure to customise these..
-  #srcdir => "/var/sites/rhatto/ikiwiki_src",
-  #destdir => "/var/sites/rhatto/ikiwiki",
+  srcdir => ".",
+  destdir => "www",
 
   url => "https://rhatto.sarava.org",
   cgiurl => "https://rhatto.sarava.org/ikiwiki.cgi",
@@ -108,6 +108,7 @@ use IkiWiki::Setup::Standard {
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        #exclude => qr/\.wav$/,
+       exclude => qr/www/,
        # To change the extension used for generated html files.
        #htmlext => 'htm',
        # Time format (for strftime)