external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the OpenSSH patch

Browse source 
Extended AuthorizedKeysCommand parameters are now officially supported
by OpenSSH.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-05-21 10:48:23 +02:00
parent 75923205af
commit 42b9e4dd28
3 changed files with 18 additions and 1120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
INSTALL
View file

@ -17,39 +17,28 @@ Setup on Arch Linux
4) Create a new MySQL database and a user and import the AUR SQL schema: 4) Create a new MySQL database and a user and import the AUR SQL schema:
$ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql $ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql
5) Generate templates for new Git repositories: 5) Generate templates for new Git repositories:
$ /srv/http/aurweb/scripts/git-integration/gen-templates.py $ /srv/http/aurweb/scripts/git-integration/gen-templates.py
6) Clone the OpenSSH project, apply the aurweb sshd patch and run `make`: 6) Create a new user:
$ cd /srv/http/aurweb/ # useradd -U -d /srv/http/aurweb -c 'AUR user' aur
$ git clone git://anongit.mindrot.org/openssh.git
$ cd openssh
$ git checkout V_6_8_P1
$ git am ../scripts/git-integration/0001-Patch-sshd-for-the-AUR.patch
$ autoreconf
$ ./configure
$ make
7) Create and edit the sshd configuration: 7) Install the git-auth wrapper script:
$ cd /srv/http/aurweb/ # cd /srv/http/aurweb/scripts/git-integration/
$ umask 077 # cp git-auth.sh /usr/local/bin/aur-git-auth
$ mkdir .ssh/ # chmod 755 /usr/local/bin/aur-git-auth
$ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa
$ cp scripts/git-integration/sshd_config .ssh/
8) Create a new user and change ownership of the .ssh directory: 8) Configure sshd(8) for the AUR. Add the following lines at the end of your
sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is
needed!
# useradd -U -d /srv/http/aurweb -c 'AUR user' aur Match User aur
# chown aur:aur /srv/http/aurweb/.ssh/ PasswordAuthentication no
AuthorizedKeysCommand /usr/local/bin/aur-git-auth "%t" "%k"
AuthorizedKeysCommandUser aur
9) Add, enable and start systemd unit files for the new sshd:
# cp /srv/http/aurweb/conf/aur-sshd.socket /etc/systemd/system/
# cp /srv/http/aurweb/conf/aur-sshd@.service /etc/systemd/system/
# systemctl enable aur-sshd.socket
# systemctl start aur-sshd.socket

1094
scripts/git-integration/0001-Patch-sshd-for-the-AUR.patch
View file

File diff suppressed because it is too large Load diff

3
scripts/git-integration/git-auth.sh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/sh
/srv/http/aurweb/scripts/git-integration/git-auth.py "$1" "$2"