aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/README.md b/README.md
index cc25bb5..dbdaf1a 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ chmod 644 /etc/cgitrc
```
Now authorize the helper key. **Do NOT add it to the git user's normal
-`~/.ssh/authorized_keys`** — gitolite owns and regenerates that file from its
+`~/.ssh/authorized_keys`**: gitolite owns and regenerates that file from its
keydir, so a hand-added line is wiped and, worse, an existing gitolite key may
match first and run `gitolite-shell` instead of the helper (you get
`FATAL: unknown git/gitolite command`).
@@ -130,9 +130,11 @@ ssh git_push info # gitolite access check
sudo install -m 755 -o root -g root gitctl-helper /usr/local/bin/gitctl-helper
```
2. Confirm the constants at the top of `gitctl-helper` match your server:
- `REPO_BASE`, `CGITRC`, `SYNC_SCRIPT`, `BACKUP_DIR`, `DEFAULT_OWNER`. The git
- user must be able to create `BACKUP_DIR` (default
- `/var/lib/gitolite3/cgitrc-backups`); it is made on first write.
+ `REPO_BASE`, `CGITRC`, `SYNC_SCRIPT`, `BACKUP_DIR`, `TRASH_DIR`,
+ `DEFAULT_OWNER`. The git user must be able to create `BACKUP_DIR` (default
+ `/var/lib/gitolite3/cgitrc-backups`) and `TRASH_DIR` (default
+ `/var/lib/gitolite3/trash`, where `repo delete` moves bare repos); both are
+ made on first write.
3. Authorize the helper key (see SSH setup, step 2).
4. Self-test the helper:
```