diff options
Diffstat (limited to 'website')
| -rw-r--r-- | website/bugs/monkeysphere-gen-subkey-treats-revoked-auth-subkey-as-valid.mdwn | 21 | ||||
| -rw-r--r-- | website/doc.mdwn | 2 | ||||
| -rw-r--r-- | website/mirrors.mdwn | 45 |
3 files changed, 54 insertions, 14 deletions
diff --git a/website/bugs/monkeysphere-gen-subkey-treats-revoked-auth-subkey-as-valid.mdwn b/website/bugs/monkeysphere-gen-subkey-treats-revoked-auth-subkey-as-valid.mdwn new file mode 100644 index 0000000..8181437 --- /dev/null +++ b/website/bugs/monkeysphere-gen-subkey-treats-revoked-auth-subkey-as-valid.mdwn @@ -0,0 +1,21 @@ +If you have a revoked authentication subkey in your keyring, +monkeysphere gen-subkey thinks that I have an authentication subkey +already, which I do, but it probably shouldn't care about it, since it +is revoked: + + 21:30@pond> monkeysphere gen-subkey F67E2A5D1CF2D62A + An authentication subkey already exists for key 'F67E2A5D1CF2D62A'. + Are you sure you would like to generate another one? (y/N) + +However: this key was revoked on 2008-04-28 by DSA key 1CF2D62A Micah Anderson <micah@riseup.net> + sub 1024R/866F47D3 created: 2008-02-25 revoked: 2008-04-28 usage: A + +I can continue to create a new authorization subkey, so its not a +blocker or anything (I suppose I could also delete the revoked key +from my keyring as well, although thats less than ideal). + +It seems like the secret keyring doesn't mention that it has been +revoked, so probably monkeysphere needs to be looking at gpg's +computed validity from the public keyring instead of the secret +keyring to be able to get the "r" flag from field 2, in addition to +the "e" flag from field 12. diff --git a/website/doc.mdwn b/website/doc.mdwn index 997c34d..18b48a2 100644 --- a/website/doc.mdwn +++ b/website/doc.mdwn @@ -10,8 +10,10 @@ Monkeysphere relies on: ## Getting started ## + * [Downloading and installing](/download) * Getting started as a [user](/getting-started-user) * Getting started as a [server admin](/getting-started-admin) + * [Developing the monkeysphere](/community) ## References ## diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn index feee9bd..44f50d9 100644 --- a/website/mirrors.mdwn +++ b/website/mirrors.mdwn @@ -8,9 +8,7 @@ We're mirrored on several servers. Rather than using ikiwiki's [pinger/pingee approach to distribution](http://ikiwiki.info/tips/distributed_wikis/), we've opted for a method that uses ssh. -The steps for creating a new mirror are: - -## Steps to take on the mirror server ## +## Initial steps to take on the mirror server ## Add etch-backports to your /etc/apt/sources.list: @@ -50,19 +48,12 @@ Add web site configuration that the user has write access to. If you are using A Upload and edit ikiwiki.setup.sample from the docs directory -As the new user, create two new git repos - - mkdir monkeysphere.git; cd monkeysphere.git; git init --bare; cd ../ - git clone monkeysphere.git # this will create a second git repo called monkeysphere - -Change the mode of monkeysphere.git/hooks/post-receive to 755 +As the new user, create a git repo - chmod 755 monkesphere.git/hooks/post-receive + mkdir monkeysphere.git; cd monkeysphere.git; git init --bare; -Edit the file so that it executes the post-receive hook ikiwiki generates (as -you specified in the ikiwiki.setup file) -## Admin steps to take to enable the configuration ## +## Initial Admin steps to take to enable the configuration ## Add a new dns record for SERVERNAME.monkeysphere.info. @@ -73,9 +64,35 @@ Add the new server as a remote on webmaster@george.riseup.net:monkeysphere.git cd ~/monkeysphere.git git add remote SERVERNAME USER@SERVERNAME.monkeysphere.info:/path/to/repo +Modify ~/monkeysphere.git/config, so the new repo stanza looks like this: + + [remote "SERVERNAME"] + url = USER@SERVERNAME.monkeysphere.info:monkeysphere.git + push = +refs/heads/master + skipDefaultUpdate = true + Test: git push SERVERNAME - +## Final steps to take on mirror server ## + +At this point, you should have a populated git repo in your +monkeyshere.git directory. + +Change the mode of monkeysphere.git/hooks/post-receive to 755 + + chmod 755 monkesphere.git/hooks/post-receive + +Edit the file so that it executes the post-receive hook ikiwiki generates (as +you specified in the ikiwiki.setup file) + +Next, clone the repository: + + clone monkeysphere.git monkeysphere + +And lastly, run ikiwiki manually to generate the post-receive hook: + + ikiwiki --setup ikiwiki.setup + |