Static generation updates

diff --git a/Makefile b/Makefile
index a36d227cd3d313b0642f83b954d68e5bf4e3176d..635ffef8000a4868ae1ae55afa70e061eaf5b33c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,5 +17,5 @@
 wiki:
        @ikiwiki --setup ikiwiki.setup
 
-deploy:
+wiki_deploy:
        @rsync -avz --delete www/ blog:/var/sites/rhatto/www/

diff --git a/ikiwiki.setup b/ikiwiki.setup
index f899283bb14b83fccd781f2f24ed9aaa1f6be99e..bd0a90dc8140c40e865aa944da213eed55fe28c2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -32,6 +32,8 @@ use IkiWiki::Setup::Standard {
   diffurl => "https://git.sarava.org/?p=rhatto.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
        #gitorigin_branch => "origin",
        #gitmaster_branch => "master",
+       # See https://ikiwiki.info/tips/laptop_wiki_with_git/
+       gitorigin_branch => '',
 
        # Tla stuff.
        #rcs => "tla"
@@ -45,7 +47,7 @@ use IkiWiki::Setup::Standard {
 
        # Bazaar stuff.
        #rcs => "bzr",
-       #historyurl => "", 
+       #historyurl => "",
        #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
 
        # Monotone stuff
@@ -144,10 +146,10 @@ use IkiWiki::Setup::Standard {
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff search wikitext camelcase
        #                   htmltidy fortune sidebar map rst anonok}],
-  add_plugins => [qw{goodstuff sidebar}],  
+  add_plugins => [qw{goodstuff sidebar}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-  disable_plugins => [qw{openid editpage}],  
+  disable_plugins => [qw{openid editpage}],
        # To add a directory to the perl search path, use this.
        #libdir => "/home/me/.ikiwiki/",