From 80ae311bb03652ed2e193acaa749a2a8335db434 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 19 Jun 2015 16:41:20 -0300 Subject: Makefile: use ikiwiki.setup --- Makefile | 2 +- ikiwiki.setup | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f65366..a36d227 100644 --- 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 aba3e51..f899283 100644 --- 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) -- cgit v1.2.3