Remove absolute paths for srcdir and destdir from ikiwiki.setup.

The content is now built in ./html/.  This inspired an update to the
exclude regexp to avoid creating ./html/html/... with repeated builds.
Note that you may qhave to remove ./.ikiwiki/ for the new exclude to
take effect.

Also flesh out .gitignore to ignore built files, disable default git
pull, disable git wrapper generation, and log to the command line.

ikiwiki.setup is now better for generating the wiki to test changes
before committing them.

diff --git a/.gitignore b/.gitignore
index b84c80668674a12284e46ccf008ae639709b721c..d620b09c3d24db31efe297519978078cb42533d0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,14 @@
 /.ikiwiki
+/html
 /recentchanges
+
+# built by Makefiles inside posts/
+/posts/XSLT/chapter/chapter.html
+/posts/XSLT/code/index.shtml
+/posts/Xmodmap/_Xmodmap
+/posts/Xmodmap/dotfiles/
+/posts/Xmodmap/unicode_sampler
+/posts/rel-vcs/rel-vcs.xpi
+/posts/yacc2dot/*.output
+/posts/yacc2dot/*.png
+/posts/yacc2dot/*.tab.c

diff --git a/ikiwiki.setup b/ikiwiki.setup
index e1d310c325c1c0fe9321c84c8d1b818b2ccfdfad..665e53e506ef754681b7ec7220a1af2c2b8d9c69 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -15,9 +15,9 @@ use IkiWiki::Setup::Standard {
        # users who are banned from the wiki
        banned_users => [],
        # where the source of the wiki is located
-       srcdir => '/tmp/ikiwiki',
+       srcdir => '.',
        # where to build the wiki
-       destdir => '/tmp/ikiwiki.build',
+       destdir => 'html',
        # base url to the wiki
        url => 'http://www.physics.drexel.edu/~wking/unfolding-disasters',
        # url to the ikiwiki.cgi
@@ -37,9 +37,10 @@ use IkiWiki::Setup::Standard {
        # base wiki source location
        underlaydir => '/usr/share/ikiwiki/basewiki',
        # display verbose messages?
-       #verbose => 1,
+       verbose => 1,
        # log to syslog?
-       syslog => 1,
+       #syslog => 1,
+       syslog => 0,
        # create output files named page/index.html?
        usedirs => 1,
        # use '!'-prefixed preprocessor directives?
@@ -73,7 +74,7 @@ use IkiWiki::Setup::Standard {
        # environment variables
        ENV => {},
        # regexp of source files to ignore
-       #exclude => '\\.wav$',
+       exclude => qr/^(html\/.*|ikiwiki.setup|Makefile)/,
        # specifies the characters that are allowed in source filenames
        wiki_file_chars => '-[:alnum:]+/.:_',
        # allow symlinks in the path leading to the srcdir (potentially insecure)
@@ -81,7 +82,7 @@ use IkiWiki::Setup::Standard {
 
        # git plugin
        # git hook to generate
-       git_wrapper => '/tmp/ikiwiki.git/hooks/post-update.ikiwiki',
+       #git_wrapper => '/tmp/ikiwiki.git/hooks/post-update.ikiwiki',
        # mode for git_wrapper (can safely be made suid)
        #git_wrappermode => '06755',
        # git pre-receive hook to generate
@@ -94,6 +95,7 @@ use IkiWiki::Setup::Standard {
        #diffurl => 'http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]',
        # where to pull and push changes (set to empty string to disable)
        #gitorigin_branch => 'origin',
+       gitorigin_branch => '', # don't pull during build
        # branch that the wiki is stored in
        #gitmaster_branch => 'master',