aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-06-19 16:41:20 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-06-19 16:41:20 -0300
commit80ae311bb03652ed2e193acaa749a2a8335db434 (patch)
tree41f6c51bda32080c664347c1868200d61660b643
parent1e7da750f6e97b8fc1b8512c6822abe59b4c8a19 (diff)
downloadblog-80ae311bb03652ed2e193acaa749a2a8335db434.tar.gz
blog-80ae311bb03652ed2e193acaa749a2a8335db434.tar.bz2
Makefile: use ikiwiki.setup
-rw-r--r--Makefile2
-rw-r--r--ikiwiki.setup5
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)