summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Rayhawk <jrayhawk@omgwallhack.org>2013-05-21 14:56:37 -0700
committerJoe Rayhawk <jrayhawk@omgwallhack.org>2013-05-21 14:56:37 -0700
commit1ad150e505592ba18cf55b6c8becc12ff3796215 (patch)
tree62022a45751d904910582ffe1a6de4c8ffa5ef4d
parenteb195d93c69f7b5a31750f2f92185a6e60068d6a (diff)
wiki/401: update instructions to support new wikipasswd command
-rw-r--r--wiki/401.mdwn18
1 files changed, 10 insertions, 8 deletions
diff --git a/wiki/401.mdwn b/wiki/401.mdwn
index a26ca1e..1ec42b5 100644
--- a/wiki/401.mdwn
+++ b/wiki/401.mdwn
@@ -1,12 +1,15 @@
-# Create a http://wiki.freedesktop.org/ account
+# wiki.freedesktop.org: 401 Unauthorized
-To avoid problems with spammers, wiki.freedesktop.org uses manually compiled htpasswd entries. If you want to be able to edit through the web, you should find a way to generate a hash and safely send it to the sitewranglers, preferably with a signature.
+wiki.freedesktop.org has two authentication methods; one is through [[ssh access to fd.o shell accounts|http://www.freedesktop.org/wiki/AccountRequests/]] (e.g. <git+ssh://wiki.freedesktop.org/srv/ikiwiki/git/sitewranglers.git> ), the other is over HTTPS (e.g. <https://secure.freedesktop.org/write/sitewranglers/ikiwiki.cgi?page=wiki%2F401&do=edit> ).
+
+To avoid problems with spammers, the htpasswd entries associated with HTTPS authentication involve manual administration.
+
+If you have a freedesktop.org shell account, you can add or update any htpasswd entry: `ssh wiki.freedesktop.org sudo wikipasswd INSERT_DESIRED_USERNAME_HERE`. Use your powers wisely; everything is logged under version control.
+
+If you don't have a shell account, you should find a way to generate a hash and safely send it to the sitewranglers, preferably with a signature.
### Generation
-* remote shell e.g. on annarchy:
- * `umask 0077`
- * `htpasswd -c -m ~/userdb.htpasswd DesiredUsername` # and input your password at the prompts
* local shell:
* `htpasswd -c -m /dev/stdout DesiredUsername` # and input your password at the prompts
* browser:
@@ -24,8 +27,7 @@ To avoid problems with spammers, wiki.freedesktop.org uses manually compiled htp
### Transmisison
* If you do not have an existing shell account, send your signed hash to sitewranglers on IRC ( irc://irc.freenode.net/ usernames jrayhawk or Mithrandir ) or by email ( jrayhawk@freedesktop.org, tfheen@freedesktop.org ).
-* If you use an existing shell account (even someone else's) with which to put the htpasswd entry on Annarchy's filesystem somewhere we can find it, simply notify `sitewranglers@freedesktop.org`. Shell accounts have pre-established PGP trust.
-### Application
+### Sitewranglers
-* With a root account on annarchy, append the user's htpasswd entry to the /etc/apache2/userdb.basic file
+* With a root account on annarchy, append or replace the user's htpasswd entry in /etc/apache2/userdb.basic