diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | bin/ftppush.sh | 20 | ||||
| -rw-r--r-- | config/ikiwiki.setup.in | 40 | ||||
| -rw-r--r-- | config/include.mk | 1 |
4 files changed, 62 insertions, 2 deletions
@@ -1,7 +1,8 @@ -*/.sass-cache/ +/.sass-cache/ /build/ /content/ /styling/ /forms/ /config/ikiwiki*.setup /.ikiwiki*/ +/js/ diff --git a/bin/ftppush.sh b/bin/ftppush.sh new file mode 100755 index 0000000..3db24ce --- /dev/null +++ b/bin/ftppush.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# Expects a ~/.netrc entry like this: +# machine byvandring.nu +# login byvandring.nu +# password replaceme + +set -e + +WPUT="wput --reupload --dont-continue -v" + +quiet="-b -o $HOME/wputlog" +case "$1" in + -v) + quiet="";; +esac +WPUT="$WPUT $quiet" + +$WPUT --basename=$HOME/public_websites/bynu.biks.dk/ $HOME/public_websites/bynu.biks.dk/ ftp://byvandring.nu/public_html/ || true +$WPUT /usr/share/javascript/leaflet/ ftp://byvandring.nu/public_html/ || true diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in index ed57570..edb88e5 100644 --- a/config/ikiwiki.setup.in +++ b/config/ikiwiki.setup.in @@ -9,4 +9,42 @@ # edit this file. # # name of the wiki -wikiname: Example website +wikiname: Byvandring Nu +adminemail: paul@hartvigson.dk +adminuser: +- paul +- jonas +- siri +url: http://bynu.biks.dk/ +cgiurl: http://bynu.biks.dk/ikiwiki.cgi +add_plugins: +- lockedit +- branding +- topbar +- sidebar +- farbar +- footer +- copyright +- linkmap +- attachment +- pagestats +- httpauth +- edittemplate +disable_plugins: +- openid +- passwordauth +- search +- theme +- htmlscrubber +discussion: 0 +timeformat: '%A d. %e. %B' +locale: da_DK.UTF-8 +timezone: Europe/Copenhagen +historyurl: 'https://source.couchdesign.dk/bynu/content.git/log/[[file]]' +diffurl: 'https://source.couchdesign.dk/bynu/content.git/diff/[[file]]?id=[[sha1_commit]]' +locked_pages: '*' +multimarkdown: 1 +#allowed_attachments: maxsize(2mb) and ((*.png and mimetype(image/png)) or (*.gif and mimetype(image/gif)) or (*.jpg and mimetype(image/jpeg))) +allowed_attachments: (*.png or *.gif or *.jpg) +tagbase: tag +tag_autocreate_commit: 0 diff --git a/config/include.mk b/config/include.mk new file mode 100644 index 0000000..5c9fbfc --- /dev/null +++ b/config/include.mk @@ -0,0 +1 @@ +IKIWIKI_UNDERLAYS += $(CURDIR)/js/build |