mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-05 08:51:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-ubuntu-trusty-paramiko-hack' into 'master'

Browse source 
buildserver: remove special sshd setup for Ubuntu 14.04

See merge request fdroid/fdroidserver!374
This commit is contained in:
Hans-Christoph Steiner 2017-11-20 08:30:37 +00:00
commit 0e3d63fa1b
3 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MANIFEST.in
View file

@ -7,7 +7,6 @@ include buildserver/provision-apt-proxy
include buildserver/provision-gradle
include buildserver/provision-pip
include buildserver/provision-qt-sdk
include buildserver/provision-ubuntu-trusty-paramiko
include buildserver/setup-env-vars
include buildserver/Vagrantfile
include completion/bash-completion

5
buildserver/Vagrantfile vendored
View file

@ -80,9 +80,4 @@ Vagrant.configure("2") do |config|
config.vm.provision "file", source: "gradle",
destination: "/opt/gradle/bin/gradle"
# let Ubuntu/trusty's paramiko work with the VM instance
if `uname -v`.include? "14.04"
config.vm.provision "shell", path: "provision-ubuntu-trusty-paramiko"
end
end

19
buildserver/provision-ubuntu-trusty-paramiko
View file

@ -1,19 +0,0 @@
#!/bin/bash
echo $0
set -e
# Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings
# https://stackoverflow.com/questions/7286929/paramiko-incompatible-ssh-peer-no-acceptable-kex-algorithm/32691055#32691055
if ! grep --quiet ^Ciphers /etc/ssh/sshd_config; then
echo Ciphers aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr >> /etc/ssh/sshd_config
fi
if ! grep --quiet ^MACs /etc/ssh/sshd_config; then
echo MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,hmac-ripemd160,hmac-sha1 >> /etc/ssh/sshd_config
fi
if ! grep --quiet ^KexAlgorithms /etc/ssh/sshd_config; then
echo KexAlgorithms diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1 >> /etc/ssh/sshd_config
fi