[aur-dev] [PATCH] Change default configuration to use SSH port 22

[Lukas Fleischer]

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 at archlinux.org>
---
 conf/aur-sshd.socket                | 6 ------
 conf/aur-sshd at .service              | 8 --------
 conf/cgitrc.proto                   | 2 +-
 conf/config.proto                   | 2 +-
 scripts/git-integration/sshd_config | 6 ------
 5 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 conf/aur-sshd.socket
 delete mode 100644 conf/aur-sshd at .service
 delete mode 100644 scripts/git-integration/sshd_config

diff --git a/conf/aur-sshd.socket b/conf/aur-sshd.socket
deleted file mode 100644
index 5b0c3df..0000000
--- a/conf/aur-sshd.socket
+++ /dev/null
@@ -1,6 +0,0 @@
-[Socket]
-ListenStream=2222
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/conf/aur-sshd at .service b/conf/aur-sshd at .service
deleted file mode 100644
index 5ec410a..0000000
--- a/conf/aur-sshd at .service
+++ /dev/null
@@ -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
diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto
index 86b410b..d9bde83 100644
--- a/conf/cgitrc.proto
+++ b/conf/cgitrc.proto
@@ -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
diff --git a/conf/config.proto b/conf/config.proto
index 99ab602..623d044 100644
--- a/conf/config.proto
+++ b/conf/config.proto
@@ -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 at archlinux.org
 request_idle_time = 1209600
diff --git a/scripts/git-integration/sshd_config b/scripts/git-integration/sshd_config
deleted file mode 100644
index d3d2f5a..0000000
--- a/scripts/git-integration/sshd_config
+++ /dev/null
@@ -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
-- 
2.4.1