summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ikiwiki-mass-rebuild.mdwn7
-rw-r--r--doc/todo/user-subdir_mechanism_like_etc_ikiwiki_wikilist.mdwn2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/ikiwiki-mass-rebuild.mdwn b/doc/ikiwiki-mass-rebuild.mdwn
index e5474dd26..5af030eea 100644
--- a/doc/ikiwiki-mass-rebuild.mdwn
+++ b/doc/ikiwiki-mass-rebuild.mdwn
@@ -10,10 +10,15 @@ ikiwiki-mass-rebuild
`ikiwiki-mass-rebuild` can be used to force a rebuild of all the wikis
on a system. You will need to list the wikis it shuld build in the file
-/etc/ikiwiki/wikilist, which has the format:
+`/etc/ikiwiki/wikilist`, which has the format:
user /path/to/wiki
+It's also possible to let a user list setup files in `~user/.ikiwiki/wikilist`
+in their home directory. To do so, list only the user's name, without a
+setup file. The format of `~/.ikiwiki/wikilist` is the same as
+`/etc/ikiwiki/wikilist`.
+
# OPTIONS
All options are passed on to ikiwiki.
diff --git a/doc/todo/user-subdir_mechanism_like_etc_ikiwiki_wikilist.mdwn b/doc/todo/user-subdir_mechanism_like_etc_ikiwiki_wikilist.mdwn
index c9f5461d3..826990e9f 100644
--- a/doc/todo/user-subdir_mechanism_like_etc_ikiwiki_wikilist.mdwn
+++ b/doc/todo/user-subdir_mechanism_like_etc_ikiwiki_wikilist.mdwn
@@ -1 +1,3 @@
Currently, ikiwiki has the configuration file `/etc/ikiwiki/wikilist`, which `ikiwiki-mass-rebuild` can use to rebuild all the ikiwikis on the system, such as when upgrading ikiwiki. This file includes usernames, and `ikiwiki-mass-rebuild` (which must run as root) changes to the specified user to rebuild their wiki. However, this means that adding new ikiwikis to the list must require administrator action, since editing the file would allow you to run ikiwiki as any user. What about a user-subdirectory mechanism for this? If each user could have their own `/etc/ikiwiki/users/$user/wikilist`, which only contained wikis (no users), `ikiwiki-mass-rebuild` could rebuild each wiki in this list as the corresponding user only. This would mean that an administrator need only create the directory and provide user or group write permission, and the user or group can then create wikis as needed.
+
+[[todo/Done]], though somewhat differently. --[[Joey]]