diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki-makerepo.mdwn | 5 | ||||
| -rw-r--r-- | doc/setup.mdwn | 25 |
2 files changed, 7 insertions, 23 deletions
diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index e76b3f318..dcebbb96a 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -4,7 +4,7 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control # SYNOPSIS -ikiwiki-makerepo svn|git srcdir repository +ikiwiki-makerepo svn|git|monotone srcdir repository ikiwiki-makerepo mercurial srcdir @@ -17,6 +17,9 @@ mercurial repository. Note that for mercurial, the srcdir is converted into a mercurial repository. There is no need to have a separate repository with mercurial. +Note that for monotone, you are assumed to already have run "mtn genkey" to generate +key. + # AUTHOR Joey Hess <joey@ikiwiki.info> diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 647e8b86f..affc3ec16 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -181,28 +181,9 @@ about using the git repositories. [[!toggle id=monotone text="Monotone"]] [[!toggleable id=monotone text=""" - # These instructions are standard instructions to import a directory into monotone - # and set it up so that you don't need any passwords to use it - REPOSITORY=~/.ikiwiki/mtn.db - BRANCH=com.company.wikiname - # remember the password you use in the next step and - # substitute it for 'wikiKeyPass' in the get_passphrase() hook below - # note the you should never generate two monotone keys with the same name - mtn genkey web@example.com - mtn db init --db=$REPOSITORY - mv $SRCDIR $SRCDIR-old - cd $SRCDIR-old - echo ".ikiwiki" > $SRCDIR-old/.mtn-ignore - mtn --db=$REPOSITORY --branch=$BRANCH import . -m "initial import" - cd .. - mtn --db=$REPOSITORY --branch=$BRANCH checkout $SRCDIR - mv $SRCDIR-old/.ikiwiki $SRCDIR - cat << EOF > $SRCDIR/_MTN/monotonerc - function get_passphrase (branchname) - return "wikiKeyPass" - end - EOF - rm -r $SRCDIR-old + # This assumes that you have already used "mtn genkey you@hostname". + REPOSITORY=~/wiki.monotone + ikiwiki-makerepo git $SRCDIR $REPOSITORY """]] ## Configure ikiwiki to use revision control. |