summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-23 22:20:34 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-23 22:20:34 +0200
commit2819aa13fbf4a52ba5abb9ebbfb2f17ac48d49f7 (patch)
tree5a22e209236c83534a9332ff43284112faec466d
parent116fd813d9ddfe8937feaf15d7a027a0d2ddfc3a (diff)
Drop nonedit branches: Disable plugin editpage instead.
-rw-r--r--.gitmodules6
m---------basewiki_nonedit0
-rw-r--r--ikiwiki.setup8
m---------templates_nonedit0
4 files changed, 5 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index 3b9000a..464012b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,12 +10,6 @@
[submodule "templates"]
path = templates
url = git://source.jones.dk/ikiwiki/templates
-[submodule "basewiki_nonedit"]
- path = basewiki_nonedit
- url = git://source.jones.dk/ikiwiki/basewiki
-[submodule "templates_nonedit"]
- path = templates_nonedit
- url = git://source.jones.dk/ikiwiki/templates
[submodule "javascript"]
path = javascript
url = git://source.jones.dk/ikiwiki/javascript
diff --git a/basewiki_nonedit b/basewiki_nonedit
deleted file mode 160000
-Subproject fe0ab0103ba4810ab9a4c63391107e415e2cae5
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 460f109..1b51089 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -31,14 +31,16 @@ use IkiWiki::Setup::Standard {
# plugins to add to the default configuration
add_plugins => [],
# plugins to disable
- disable_plugins => [],
+ disable_plugins => [qw{
+ editpage
+ }],
# location of template files
- templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit',
+ templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
# base wiki source location
underlaydirs => [
$ENV{'HOME'} . "/private_webdata/samplewiki/content",
],
- underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit',
+ underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki',
# display verbose messages when building?
#verbose => 1,
# log to syslog?
diff --git a/templates_nonedit b/templates_nonedit
deleted file mode 160000
-Subproject 0afeb58d9cf13d7313607a268a2b9d1ffa7f158