summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 13:09:59 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 13:09:59 +0200
commit84548401b3eb8275ed764926c593c148cf50043c (patch)
tree505327d10e9b0f0a86191def48c7a216cfc932ba
parentd331142d3b4d740e4b1e8306ff7667b37332ed0a (diff)
Use nonedit branch and dummy content for main setup.
-rw-r--r--Makefile6
-rw-r--r--ikiwiki.setup9
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 5313874..1eddc6c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@ SOURCES = ikiwiki
ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
ikiwiki_MODULES = templates basewiki smiley
-#ikiwiki_basewiki_FLAVORS = nonedit
-#ikiwiki_templates_FLAVORS = nonedit
+ikiwiki_basewiki_FLAVORS = nonedit
+ikiwiki_templates_FLAVORS = nonedit
ikiwiki_POMODULES = basewiki smiley
ikiwiki_BRANCH = master-FLAVOR-LOCALE
#ikiwiki_LOCALES = da nb
ikiwiki_POLOCALES = da
-#dummy_MODULES = content_dummy
+dummy_MODULES = content_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
#CONFIGS = ikiwiki.setup ikiwiki_admin.setup
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 16e0ee8..d9d6973 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -11,13 +11,16 @@ use IkiWiki::Setup::Standard {
adminemail => 'me@example.org',
# Be sure to customise these..
- srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content",
+ srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content_dummy",
destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki",
url => "http://wiki.example.org",
cgiurl => "http://wiki.example.org/ikiwiki.cgi",
- templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates",
- underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki",
+ templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit",
+ underlaydirs => [
+ $ENV{'HOME'} . "/private_webdata/samplewiki/content",
+ ],
+ underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit",
# Subversion stuff.
#rcs => "svn",