--- a/README Mon Jun 16 17:23:05 2008 +0100
+++ b/README Mon Jun 16 17:24:53 2008 +0100
@@ -1,4 +1,4 @@
-hg-admin-tools
+mercurial-server
A set of tools for managing authorization and access control for
ssh-based Mercurial repositories
@@ -173,13 +173,13 @@
fix things). Then go into ~hg/repos/hgadmin, do an "hg update", edit
things to your satisfaction, and commit the change. Finally, run
-~hg/admin/hg-admin-tools/refresh-auth ~hg/.ssh/authorized_keys ./hg-ssh-wrapper
+~hg/admin/mercurial-server/refresh-auth ~hg/.ssh/authorized_keys ./hg-ssh-wrapper
to regenerate ~hg/.ssh/authorized_keys.
THANKS
-Thanks for reading this far. If you use hg-admin-tools, please tell
+Thanks for reading this far. If you use mercurial-server, please tell
me about it.
Paul Crowley, 2008
--- a/install Mon Jun 16 17:23:05 2008 +0100
+++ b/install Mon Jun 16 17:24:53 2008 +0100
@@ -2,23 +2,23 @@
set -e
-install -o root -g root -d /usr/local/lib/hg-admin-tools
-install -o root -g root -t /usr/local/lib/hg-admin-tools \
+install -o root -g root -d /usr/local/lib/mercurial-server
+install -o root -g root -t /usr/local/lib/mercurial-server \
src/access.py \
src/hg-ssh \
src/refresh-auth \
src/ruleset.py
-install -o root -g root -d /usr/local/lib/hg-admin-tools/init
-install -o root -g root -t /usr/local/lib/hg-admin-tools/init \
+install -o root -g root -d /usr/local/lib/mercurial-server/init
+install -o root -g root -t /usr/local/lib/mercurial-server/init \
src/init/hgadmin-hgrc
-install -o root -g root -d /usr/local/lib/hg-admin-tools/init/break-in
-install -o root -g root -t /usr/local/lib/hg-admin-tools/init/break-in \
+install -o root -g root -d /usr/local/lib/mercurial-server/init/break-in
+install -o root -g root -t /usr/local/lib/mercurial-server/init/break-in \
src/init/break-in/create-breakin-repository \
src/init/break-in/ssh-replacement
src/init/break-in/as-if-by-ssh
src/init/break-in/break-in
-install -o root -g root -d /etc/hg-admin-tools
-install -o root -g root -t /etc/hg-admin-tools \
+install -o root -g root -d /etc/mercurial-server
+install -o root -g root -t /etc/mercurial-server \
src/init/conf/hg-ssh-wrapper \
src/init/conf/remote-hgrc
--- a/src/hg-ssh Mon Jun 16 17:23:05 2008 +0100
+++ b/src/hg-ssh Mon Jun 16 17:24:53 2008 +0100
@@ -12,7 +12,7 @@
"""
hg-ssh - limit access to hg repositories reached via ssh. Part of
-hg-admin-tools.
+mercurial-server.
This script is called by hg-ssh-wrapper with no arguments - everything
should be in enviroment variables:
--- a/src/init/break-in/as-if-by-ssh Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/break-in/as-if-by-ssh Mon Jun 16 17:24:53 2008 +0100
@@ -6,5 +6,5 @@
echo "SSH_ORIGINAL_COMMAND=$SSH_ORIGINAL_COMMAND" >&2
export SSH_ORIGINAL_COMMAND
cd
-exec /etc/hg-admin-tools/hg-ssh-wrapper root
+exec /etc/mercurial-server/hg-ssh-wrapper root
--- a/src/init/break-in/break-in Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/break-in/break-in Mon Jun 16 17:24:53 2008 +0100
@@ -4,7 +4,7 @@
user=$(whoami)
-/usr/local/lib/hg-admin-tools/init/break-in/create-breakin-repository
+/usr/local/lib/mercurial-server/init/break-in/create-breakin-repository
cd hgadmin
mkdir -p keys
ssh-add -L > keys/$user
--- a/src/init/break-in/create-breakin-repository Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/break-in/create-breakin-repository Mon Jun 16 17:24:53 2008 +0100
@@ -2,11 +2,11 @@
set -e
-hg clone -e /usr/local/lib/hg-admin-tools/init/break-in/ssh-replacement ssh://localhost/hgadmin
+hg clone -e /usr/local/lib/mercurial-server/init/break-in/ssh-replacement ssh://localhost/hgadmin
cd hgadmin
cat >> .hg/hgrc << __END__
[ui]
-ssh = /usr/local/lib/hg-admin-tools/init/break-in/ssh-replacement
+ssh = /usr/local/lib/mercurial-server/init/break-in/ssh-replacement
__END__
echo "cd to hgadmin, make changes and commit"
--- a/src/init/break-in/ssh-replacement Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/break-in/ssh-replacement Mon Jun 16 17:24:53 2008 +0100
@@ -3,5 +3,5 @@
echo "arg: $2" >&2
-exec sudo -H -u hg /usr/local/lib/hg-admin-tools/init/break-in/as-if-by-ssh "$2"
+exec sudo -H -u hg /usr/local/lib/mercurial-server/init/break-in/as-if-by-ssh "$2"
--- a/src/init/conf/hg-ssh-wrapper Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/conf/hg-ssh-wrapper Mon Jun 16 17:24:53 2008 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
-# This file should live in /etc/hg-admin-tools. It expects
+# This file should live in /etc/mercurial-server. It expects
# to be specified as the target of the "command" section in the prefix
# of a key in the authorized_keys file, and be passed a name associated
# with an ssh key as its only argument. It does some setting up before
@@ -16,7 +16,7 @@
# Use a different hgrc for remote pulls - this way you can set
# up access.py for everything at once without affecting local operations
-HGRCPATH=/etc/hg-admin-tools/remote-hgrc
+HGRCPATH=/etc/mercurial-server/remote-hgrc
export HGRCPATH
# Set up this environment variable - useful for hg hooks to check.
@@ -26,5 +26,5 @@
cd repos
HG_ACCESS_RULES_FILE=$(pwd)/hgadmin/hg-ssh-access.conf
export HG_ACCESS_RULES_FILE
-exec /usr/local/lib/hg-admin-tools/hg-ssh
+exec /usr/local/lib/mercurial-server/hg-ssh
--- a/src/init/conf/remote-hgrc Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/conf/remote-hgrc Mon Jun 16 17:24:53 2008 +0100
@@ -1,7 +1,7 @@
# hgrc to use for all remote users
[extensions]
-access = /usr/local/lib/hg-admin-tools/access.py
+access = /usr/local/lib/mercurial-server/access.py
[hooks]
pretxnchangegroup.access = python:access.hook
--- a/src/init/hgadmin-hgrc Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/hgadmin-hgrc Mon Jun 16 17:24:53 2008 +0100
@@ -4,5 +4,5 @@
[hooks]
changegroup.aaaaa_update = hg update -C default > /dev/null
changegroup.aaaab_purge = hg purge --all > /dev/null
-changegroup.refreshauth = /usr/local/lib/hg-admin-tools/refresh-auth ~/.ssh/authorized_keys /etc/hg-admin-tools/hg-ssh-wrapper
+changegroup.refreshauth = /usr/local/lib/mercurial-server/refresh-auth ~/.ssh/authorized_keys /etc/mercurial-server/hg-ssh-wrapper
--- a/src/init/hginit Mon Jun 16 17:23:05 2008 +0100
+++ b/src/init/hginit Mon Jun 16 17:24:53 2008 +0100
@@ -6,5 +6,5 @@
mkdir -p repos/hgadmin .ssh
cd repos/hgadmin
hg init .
-cp /usr/local/lib/hg-admin-tools/hgadmin-hgrc .hg/hgrc
+cp /usr/local/lib/mercurial-server/hgadmin-hgrc .hg/hgrc