From 9352a728617d422f5b86100efdcbc72a6d3ca78a Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 5 Sep 2008 00:20:27 -0400 Subject: changed intro to trust model docs. --- website/trust-models.mdwn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'website') diff --git a/website/trust-models.mdwn b/website/trust-models.mdwn index 8fee5cb..789e3a3 100644 --- a/website/trust-models.mdwn +++ b/website/trust-models.mdwn @@ -6,11 +6,11 @@ Monkeysphere relies on GPG's definition of the OpenPGP web of trust, so it's important to understand how GPG calculates User ID validity for a key. -The basic question asked is: For a given User ID on a specific key, -given some set of valid certifications (signatures), and some explicit -statements about whose certifications you think are trustworthy -(ownertrust), should we consider this User ID to be legitimately -attached to this key (a "valid" User ID)? +The basic question that a trust model tries to answer is: For a given +User ID on a specific key, given some set of valid certifications +(signatures), and some explicit statements about whose certifications +you think are trustworthy (ownertrust), should we consider this User +ID to be legitimately attached to this key (a "valid" User ID)? It's worth noting that there are two integral parts in this calculation: -- cgit v1.2.3 From 2a597cae492b90eb0d66f29ff54a99860247dd3c Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Fri, 5 Sep 2008 00:24:12 -0400 Subject: updating mirrors help file to reflect new rsync approach. --- website/mirrors.mdwn | 82 ++++++++++------------------------------------------ 1 file changed, 15 insertions(+), 67 deletions(-) (limited to 'website') diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn index 44f50d9..7464519 100644 --- a/website/mirrors.mdwn +++ b/website/mirrors.mdwn @@ -6,93 +6,41 @@ stored in our git repositories and converted into html by 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. +opted for a simpler rsync of the ikiwiki-produced html files. ## Initial steps to take on the mirror server ## -Add etch-backports to your /etc/apt/sources.list: +Create a new user. - deb http://www.backports.org/debian etch-backports main contrib non-free - -Add the following lines to your /etc/apt/preferences file: - - Package: ikiwiki - Pin: release a=etch-backports - Pin-Priority: 999 - - # needed by ikiwiki - Package: libcgi-formbuilder-perl - Pin: release a=etch-backports - Pin-Priority: 999 - - Package: git-core - Pin: release a=etch-backports - Pin-Priority: 999 - -Install git-core and ikiwiki - - aptitude update; aptitutde install git-core ikiwiki - -Create a new user. Change the new users shell to git-shell: - - adduser -s /usr/bin/git-shell - -Add webmaster@george's public key to this user's ~/.ssh/authorized_keys file - -Add web site configuration that the user has write access to. If you are using Apache, include the following rewrite: +Add web site configuration that the user has write access to. If you are +using Apache, include the following rewrite: RewriteEngine On RewriteCond %{HTTP_HOST} !^(YOURHOSTNAME|web)\.monkeysphere\.info$ [NC] RewriteCond %{HTTP_HOST} !^$ RewriteRule ^/(.*) http://web.monkeysphere.info/$1 [L,R] -Upload and edit ikiwiki.setup.sample from the docs directory - -As the new user, create a git repo +Add webmaster@george's public key to this user's ~/.ssh/authorized_keys +file, restricting that user to rsync (modify path to web directory as +needed): - mkdir monkeysphere.git; cd monkeysphere.git; git init --bare; + command="/usr/bin/rsync --server -vlogDtprz --delete . web/",no-pty,no-agent-forwarding,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0SCD6tAh7g1yyuelIm5zyh5OFX89NNbpNzyp+BxXNxMc/C1BS9SN5KlNDT30WdDbw3X0St0dBBC69TZWYbSUn4+/6BNmYpLH2orhedBv4w2jBLmtVEfnMWa3a11CnIagMEkEz7rBIWpl76WOqzoueQbAAa/7GziVmv+2qdjcDFxHluO+VL/+gEw8BqZc587oiDYkIw3oBnOLaxUWDtaMFKiL8sgdBmPxzc8PgHxL5ezVDJExw5krR4FK7hG7KpBOlSwKQPFy2pPhHSb1ZuFJmp2kr2wfJ0RO7By5s/GbrkJbnGoiJ5W0fUC9YoI82U3svC5saowvoSo19yToJW4QUw== webmaster@george -## Initial Admin steps to take to enable the configuration ## +## Admin steps to take to enable the configuration ## Add a new dns record for SERVERNAME.monkeysphere.info. -Test the ssh connection by logging in as webmaster@george.riseup.net - -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 +If the mirror server is not participating in the monkeysphere, add the +server to webmaster's known host file. - chmod 755 monkesphere.git/hooks/post-receive +Add the new server to ~/mirrors file on george in the format: -Edit the file so that it executes the post-receive hook ikiwiki generates (as -you specified in the ikiwiki.setup file) + username@server:directory -Next, clone the repository: +Test by manually running the git post-receive hook: - clone monkeysphere.git monkeysphere + ~monkeysphere.git/hooks/post-receive -And lastly, run ikiwiki manually to generate the post-receive hook: - ikiwiki --setup ikiwiki.setup -- cgit v1.2.3 From 45fd2830db11cc57bfc45cbf6837e06e57247129 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 5 Sep 2008 00:25:11 -0400 Subject: implementing Dan Scott small-caps suggestion for nav links. --- website/local.css | 2 ++ website/sidebar.mdwn | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'website') diff --git a/website/local.css b/website/local.css index 69defae..cb966f8 100644 --- a/website/local.css +++ b/website/local.css @@ -61,12 +61,14 @@ table.sitenav img.logo { table.sitenav a { font-weight: bold; margin-right: 1em; + font-variant: small-caps; } table.sitenav span.selflink { font-weight: bold; text-decoration: underline; margin-right: 1em; + font-variant: small-caps; } div.header { diff --git a/website/sidebar.mdwn b/website/sidebar.mdwn index 33ab8ce..bc5dc69 100644 --- a/website/sidebar.mdwn +++ b/website/sidebar.mdwn @@ -3,11 +3,11 @@ -[[WHY?|why]] -[[DOWNLOAD|download]] -[[DOCUMENTATION|doc]] -[[NEWS|news]] -[[COMMUNITY|community]] -[[BUGS|bugs]] +[[Why?|why]] +[[Download|download]] +[[Documentation|doc]] +[[News|news]] +[[Community|community]] +[[Bugs|bugs]] -- cgit v1.2.3 From eeaa6fa40c74b674602562701b423bd244f2691f Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Fri, 5 Sep 2008 00:27:03 -0400 Subject: adding link to mirrors page. --- website/doc.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'website') diff --git a/website/doc.mdwn b/website/doc.mdwn index 18b48a2..c59119f 100644 --- a/website/doc.mdwn +++ b/website/doc.mdwn @@ -25,3 +25,4 @@ Monkeysphere relies on: ## Other ## * [Similar Projects](/similar) (other attempts at a PKI for SSH) + * [Mirroring the website](/mirrors) -- cgit v1.2.3 From 124108155193780f4b84d7284ab3dcb53200fa97 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 5 Sep 2008 00:53:00 -0400 Subject: minor formatting tweaks on mirrors page. --- website/mirrors.mdwn | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'website') diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn index 7464519..5fcc347 100644 --- a/website/mirrors.mdwn +++ b/website/mirrors.mdwn @@ -1,6 +1,8 @@ -[[meta title="Mirroring the web site"]] +[[meta title="Mirroring the Monkeysphere web site"]] -In keeping with the philosophy of distributed development, our web site is +# Mirroring the Monkeysphere web site # + +In keeping with the distributed philosophy of distributed development, our web site is stored in our git repositories and converted into html by [ikiwiki](http://ikiwiki.info/). @@ -20,13 +22,12 @@ using Apache, include the following rewrite: RewriteCond %{HTTP_HOST} !^$ RewriteRule ^/(.*) http://web.monkeysphere.info/$1 [L,R] -Add webmaster@george's public key to this user's ~/.ssh/authorized_keys -file, restricting that user to rsync (modify path to web directory as -needed): +Add `webmaster@george`'s public key to this user's +`~/.ssh/authorized_keys` file, restricting that user to rsync (modify +path to web directory as needed): command="/usr/bin/rsync --server -vlogDtprz --delete . web/",no-pty,no-agent-forwarding,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0SCD6tAh7g1yyuelIm5zyh5OFX89NNbpNzyp+BxXNxMc/C1BS9SN5KlNDT30WdDbw3X0St0dBBC69TZWYbSUn4+/6BNmYpLH2orhedBv4w2jBLmtVEfnMWa3a11CnIagMEkEz7rBIWpl76WOqzoueQbAAa/7GziVmv+2qdjcDFxHluO+VL/+gEw8BqZc587oiDYkIw3oBnOLaxUWDtaMFKiL8sgdBmPxzc8PgHxL5ezVDJExw5krR4FK7hG7KpBOlSwKQPFy2pPhHSb1ZuFJmp2kr2wfJ0RO7By5s/GbrkJbnGoiJ5W0fUC9YoI82U3svC5saowvoSo19yToJW4QUw== webmaster@george - ## Admin steps to take to enable the configuration ## Add a new dns record for SERVERNAME.monkeysphere.info. @@ -34,13 +35,13 @@ Add a new dns record for SERVERNAME.monkeysphere.info. If the mirror server is not participating in the monkeysphere, add the server to webmaster's known host file. -Add the new server to ~/mirrors file on george in the format: +Add the new server to `webmaster@george:~/mirrors` in the format: username@server:directory -Test by manually running the git post-receive hook: - - ~monkeysphere.git/hooks/post-receive - +Test by manually running the git post-receive hook as +`webmaster@george`: + ~/monkeysphere.git/hooks/post-receive +Add a new `A` record into the `web.monkeysphere.info` round robin. -- cgit v1.2.3 From 8765b3cc149c77b225212cfdd6bdbe9de80d76bf Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 5 Sep 2008 00:55:05 -0400 Subject: prevent page widening on the web site. --- website/local.css | 1 + 1 file changed, 1 insertion(+) (limited to 'website') diff --git a/website/local.css b/website/local.css index cb966f8..76dc4cc 100644 --- a/website/local.css +++ b/website/local.css @@ -43,6 +43,7 @@ pre { border: 1px solid #aaa; padding: 3px 3px 3px 3px; margin-left: 2em; + overflow: scroll; } table.sitenav { -- cgit v1.2.3 From 5a18c464ad8a4547d7c80aa7a508f55353e004f6 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 5 Sep 2008 00:56:04 -0400 Subject: prevent page widening, but nicer. --- website/local.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'website') diff --git a/website/local.css b/website/local.css index 76dc4cc..f7a2006 100644 --- a/website/local.css +++ b/website/local.css @@ -43,7 +43,7 @@ pre { border: 1px solid #aaa; padding: 3px 3px 3px 3px; margin-left: 2em; - overflow: scroll; + overflow: auto; } table.sitenav { -- cgit v1.2.3