summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-03 13:41:28 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-03 13:41:28 -0700
commitb7a13e19393e347ba66196a49e972d722d7d4780 (patch)
tree045738d1b0eb3fe12635347e611a24944b65a2c2
parent52d692d728d7d56ec0f17e0a9afbb6579a7eece9 (diff)
move config directory to ~/.monkeysphere
-rw-r--r--debian/changelog5
-rw-r--r--etc/monkeysphere-server.conf2
-rw-r--r--man/man1/monkeysphere.14
-rw-r--r--man/man8/monkeysphere-server.86
-rwxr-xr-xsrc/monkeysphere2
-rwxr-xr-xsrc/monkeysphere-server2
-rw-r--r--website/getting-started-admin.mdwn2
-rw-r--r--website/getting-started-user.mdwn2
8 files changed, 14 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 206ddd7..773acce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ monkeysphere (0.13~pre-1) UNRELEASED; urgency=low
[ Daniel Kahn Gillmor ]
* tweaks in /usr/bin/monkeysphere to handle odd secret keyrings.
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 21:28:51 -0400
+ [ Jameson Graef Rollins ]
+ * move location of user config directory to ~/.monkeysphere.
+
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Wed, 03 Sep 2008 13:35:23 -0700
monkeysphere (0.12-1) experimental; urgency=low
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 1b0ed9f..c001f2d 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -18,7 +18,7 @@
# of the user, and %u will be replaced by the username of the user.
# For purely admin-controlled authorized_user_ids, you might put them
# in /etc/monkeysphere/authorized_user_ids/%u
-#AUTHORIZED_USER_IDS="%h/.config/monkeysphere/authorized_user_ids"
+#AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
# Whether to add user controlled authorized_keys file to
# monkeysphere-generated authorized_keys file. Should be path to file
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index b0c896f..cabe953 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -108,13 +108,13 @@ Path to ssh authorized_keys file (~/.ssh/authorized_keys).
.SH FILES
.TP
-~/.config/monkeysphere/monkeysphere.conf
+~/.monkeysphere/monkeysphere.conf
User monkeysphere config file.
.TP
/etc/monkeysphere/monkeysphere.conf
System-wide monkeysphere config file.
.TP
-~/.config/monkeysphere/authorized_user_ids
+~/.monkeysphere/authorized_user_ids
OpenPGP user IDs associated with keys that will be checked for
addition to the authorized_keys file.
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 25dfac7..46a9727 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -154,8 +154,8 @@ Remote user's will then be granted access to a local user account
based on the appropriately signed and valid keys associated with user
IDs listed in the authorized_user_ids file of the local user. By
default, the authorized_user_ids file for local users is found in
-~/.config/monkeysphere/authorized_user_ids. This can be changed in
-the monkeysphere-server.conf file.
+~/.monkeysphere/authorized_user_ids. This can be changed in the
+monkeysphere-server.conf file.
The \fBupdate-users\fP command can then be used to generate
authorized_keys file for local users based on the authorized user IDs
@@ -191,7 +191,7 @@ OpenPGP keyserver to use (subkeys.pgp.net).
.TP
MONKEYSPHERE_AUTHORIZED_USER_IDS
Path to user authorized_user_ids file
-(%h/.config/monkeysphere/authorized_user_ids).
+(%h/.monkeysphere/authorized_user_ids).
.TP
MONKEYSPHERE_RAW_AUTHORIZED_KEYS
Path to user-controlled authorized_keys file. `-' means not to add
diff --git a/src/monkeysphere b/src/monkeysphere
index 471da20..59cb3d6 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -273,7 +273,7 @@ unset AUTHORIZED_KEYS
[ -r "${ETC}/monkeysphere.conf" ] && . "${ETC}/monkeysphere.conf"
# set monkeysphere home directory
-MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.config/monkeysphere"}
+MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.monkeysphere"}
mkdir -p -m 0700 "$MONKEYSPHERE_HOME"
# load local config
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 4c7df19..d2cac0e 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -858,7 +858,7 @@ unset MONKEYSPHERE_USER
# defaults
LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=${LOG_LEVEL:="INFO"}}
KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="subkeys.pgp.net"}}
-AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.config/monkeysphere/authorized_user_ids"}}
+AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.monkeysphere/authorized_user_ids"}}
RAW_AUTHORIZED_KEYS=${MONKEYSPHERE_RAW_AUTHORIZED_KEYS:=${RAW_AUTHORIZED_KEYS:="%h/.ssh/authorized_keys"}}
MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=${MONKEYSPHERE_USER:="monkeysphere"}}
diff --git a/website/getting-started-admin.mdwn b/website/getting-started-admin.mdwn
index 69f498a..0c4fe85 100644
--- a/website/getting-started-admin.mdwn
+++ b/website/getting-started-admin.mdwn
@@ -57,7 +57,7 @@ users with the Monkeysphere.
For each user account on the server, the userids of people authorized
to log into that account would be placed in:
- ~/.config/monkeysphere/authorized_user_ids
+ ~/.monkeysphere/authorized_user_ids
However, in order for users to become authenticated, the server must
determine that the user IDs on their keys have "full" validity. This
diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index 3f7b689..00b803e 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -120,7 +120,7 @@ update-authorized_keys command:
$ monkeysphere update-authorized_keys
This command will take all the user IDs listed in the
-`~/.config/monkeysphere/authorized_user_ids` file and check to see if
+`~/.monkeysphere/authorized_user_ids` file and check to see if
there are acceptable keys for those user IDs available. If so, they
will be added to the `~/.ssh/authorized_keys` file.