diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2015-05-21 11:20:17 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2015-05-21 11:20:17 +0200 |
| commit | c3614c4f097f1a37485672b04759c5c163f1cf42 (patch) | |
| tree | 0e168f8c5aeef13a20a049b4e924ba28b2cf97c6 | |
| parent | 42b9e4dd2870949f8dfb91e524bc13f98abd7a7d (diff) | |
| download | aur-c3614c4f097f1a37485672b04759c5c163f1cf42.tar.gz aur-c3614c4f097f1a37485672b04759c5c163f1cf42.tar.xz | |
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>
| -rw-r--r-- | conf/aur-sshd.socket | 6 | ||||
| -rw-r--r-- | conf/aur-sshd@.service | 8 | ||||
| -rw-r--r-- | conf/cgitrc.proto | 2 | ||||
| -rw-r--r-- | conf/config.proto | 2 | ||||
| -rw-r--r-- | scripts/git-integration/sshd_config | 6 |
5 files changed, 2 insertions, 22 deletions
diff --git a/conf/aur-sshd.socket b/conf/aur-sshd.socket deleted file mode 100644 index 5b0c3dfc..00000000 --- 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@.service b/conf/aur-sshd@.service deleted file mode 100644 index 5ec410ad..00000000 --- a/conf/aur-sshd@.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 86b410b8..d9bde83d 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 99ab602b..623d044a 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@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 d3d2f5a5..00000000 --- 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 |