summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--config/ikiwiki.setup.in35
-rw-r--r--config/include.mk6
3 files changed, 41 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5f6f3a9..42b3c28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*/.sass-cache/
+.sass-cache/
/build/
/content/
/styling/
diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
index ed57570..a394676 100644
--- a/config/ikiwiki.setup.in
+++ b/config/ikiwiki.setup.in
@@ -9,4 +9,37 @@
# edit this file.
#
# name of the wiki
-wikiname: Example website
+wikiname: Omnipresence
+adminemail: webmaster@couchdesign.dk
+url: http://omni-presence.dk/
+#cgiurl: http://omni.kassandra-production.dk/ikiwiki.cgi
+add_plugins:
+#- search
+- sidebar
+- branding
+- topbar
+- copyright
+- license
+- osm
+- graphviz
+disable_plugins:
+- editpage
+- htmlscrubber
+- passwordauth
+- openid
+- recentchanges
+discussion: 0
+discussionpage: Diskussion
+html5: 1
+timeformat: '%a %b %e %Y'
+locale: en_US.UTF-8
+timezone: Europe/Copenhagen
+#historyurl: 'http://source.couchdesign.dk/?p=web-omni/content.git;a=history;f=[[file]]'
+#diffurl: http://source.couchdesign.dk/?p=web-omni/content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]
+#gitorigin_branch: ''
+allowrss: 1
+allowatom: 1
+multimarkdown: 1
+tagbase: tag
+tag_autocreate: 1
+tag_autocreate_commit: 1
diff --git a/config/include.mk b/config/include.mk
new file mode 100644
index 0000000..b8e4e86
--- /dev/null
+++ b/config/include.mk
@@ -0,0 +1,6 @@
+# Avoid race condition causing styling to be shadowed by theme
+IKIWIKI_DEFAULTS += --set theme=
+IKIWIKI_UNDERLAYS := $(CURDIR)/shared/themes/goab $(IKIWIKI_UNDERLAYS)
+
+IKIWIKI_UNDERLAYS += $(CURDIR)/scripts
+IKIWIKI_DEFAULTS += --templatedir '$(CURDIR)/templates'