Change default configuration to use SSH port 22

We no longer run a separate SSH daemon on port 2222. Change the default
configuration accordingly. Also remove some configuration files that are
no longer needed.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-05-21 11:20:17 +02:00
parent 42b9e4dd28
commit c3614c4f09
5 changed files with 2 additions and 22 deletions

View file

@ -1,6 +0,0 @@
[Socket]
ListenStream=2222
Accept=yes
[Install]
WantedBy=sockets.target

View file

@ -1,8 +0,0 @@
[Unit]
Description=AUR OpenSSH Per-Connection Daemon
[Service]
ExecStart=-/srv/http/aurweb/openssh/sshd -i -f /srv/http/aurweb/.ssh/sshd_config
User=aur
StandardInput=socket
StandardError=syslog

View file

@ -1,5 +1,5 @@
virtual-root=/cgit/
clone-prefix=git+ssh://aur@aur.archlinux.org:2222
clone-prefix=git+ssh://aur@aur.archlinux.org
noheader=0
logo=
css=/css/cgit.css

View file

@ -20,7 +20,7 @@ disable_http_login = 1
aur_location = https://aur.archlinux.org
cgit_uri = https://aur.archlinux.org/cgit/
git_clone_uri_anon = https://aur.archlinux.org/cgit/%s.git/
git_clone_uri_priv = ssh+git://aur@aur.archlinux.org:2222/%s.git/
git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/
max_rpc_results = 5000
aur_request_ml = aur-requests@archlinux.org
request_idle_time = 1209600

View file

@ -1,6 +0,0 @@
Port 2222
HostKey ~/.ssh/ssh_host_rsa_key
PasswordAuthentication no
UsePrivilegeSeparation no
AuthorizedKeysCommand /srv/http/aurweb/scripts/git-integration/git-auth.py "%t" "%k"
AuthorizedKeysCommandUser aur