From f64974132deeafe713c51cbb3b283bb49937bb86 Mon Sep 17 00:00:00 2001
From: ktyl <me@ktyl.dev>
Date: Fri, 27 May 2022 01:09:58 +0100
Subject: [PATCH] minimal Git server

---
 blogs/2022/5/26/git-server.md | 80 +++++++++++++++++++++++++++++++++++
 blogs/git/git-server.md       | 62 ---------------------------
 2 files changed, 80 insertions(+), 62 deletions(-)
 create mode 100644 blogs/2022/5/26/git-server.md
 delete mode 100644 blogs/git/git-server.md

diff --git a/blogs/2022/5/26/git-server.md b/blogs/2022/5/26/git-server.md
new file mode 100644
index 0000000..4260063
--- /dev/null
+++ b/blogs/2022/5/26/git-server.md
@@ -0,0 +1,80 @@
+# A minimal Git server
+
+This is a quick, no-nonsense guide on setting up a Git server on a VPS.
+I am using Debian, but other operating systems should be easy to figure out.
+
+## Create a user
+
+Make a `git` user:
+
+```
+sudo adduser git
+```
+
+Switch to the `git` user:
+
+```
+sudo su -l git
+```
+
+## Configure secure access
+
+Create a `.ssh` dir in the `git` user's home directory and make it only accessible by the `git` user:
+
+```
+mkdir ~/.ssh
+chmod 700 ~/.ssh
+```
+
+Create an `authorized_keys` file in the `.ssh` folder, and make it accessible only by the `git` user:
+
+```
+touch .ssh/authorized_keys
+chmod 600 `.ssh/authorized_keys`
+```
+
+Create a public/private key pair locally to authenticate a user on a machine to connect to the remote server:
+
+```
+ssh-keygen -t ed25519
+```
+
+And finally copy it into the (remote) `git` user's `.ssh/authorized_keys`, using `ssh-copy-id` or by giving the public key to the server administrator.
+
+## Creating bare Git repositories
+
+Create directories within git's home dir (nested paths are allowed) with the `.git` extension, for example `my-projects/my-repo.git` or just `my-repo.git`.
+
+```
+git init --bare repo.git
+```
+
+There now exists an empty Git repository on the remote server.
+
+The remote can now be added to a local repository:
+
+```
+git remote add origin git@server:my-repo.git
+git push -u origin main
+```
+
+# Connecting securely
+
+Add an entry to your local `.ssh/config`:
+
+```
+Host myhost
+    HostName        example.com
+    User            git
+    IdentityFile    ~/.ssh/id_ed25519
+```
+
+And connect once without Git to verify the host:
+
+```
+ssh myhost
+```
+
+---
+
+Done!
diff --git a/blogs/git/git-server.md b/blogs/git/git-server.md
deleted file mode 100644
index db68fb4..0000000
--- a/blogs/git/git-server.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# create a git user
-
-on debian, `sudo adduser git`
-
-switch to git user with `sudo su -l git`
-
-create a `.ssh` dir in the git user's home dir and make it only accessible by the git user
-
-```
-mkdir ~/.ssh
-chmod 700 ~/.ssh
-```
-
-create an `authorized_keys` file in the `.ssh` folder, and make it accessible only by the git user
-
-```
-touch .ssh/authorized_keys
-chmod 600 `.ssh/authorized_keys`
-```
-
-create a private/public key pair locally to authenticate a user on a machine to connect to the remote server
-
-```
-ssh-keygen -t rsa
-```
-
-and finally copy it into the (remote) git user's `.ssh/authorized_keys`, for example using `ssh-copy-id` or giving the public key to the server administrator.
-
-# creating bare git repositories
-
-create directories within git's home dir (nested paths are allowed) with the `.git` extension, for example `my-projects/my-repo.git` or just `my-repo.git`.
-
-```
-git init --bare repo.git
-```
-
-there now exists an empty git repository on the server.
-
-the remote can now be added to a local repository
-
-```
-git remote add origin git@server:my-repo.git
-git push -u origin main
-```
-
-# connecting using the key
-
-add an entry to your local `.ssh/config`
-
-```
-Host myhost
-    HostName        example.com
-    User            git
-    IdentityFile    ~/.ssh/id_rsa
-```
-
-and connect with
-
-```
-ssh myhost
-```
-