diff options
author | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
---|---|---|
committer | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
commit | a4ab9f7f145c94a5eeb950b92b95c3d362baee67 (patch) | |
tree | b3490a4d2054b18dd1549416216557c8114329aa /testing/hosts/default/etc | |
parent | 7c6a8194526dc1035140a3157a07b2d9dbfedc59 (diff) | |
parent | bf372706c469764d59e9f29c39e3ecbebd72b8d2 (diff) | |
download | vyos-strongswan-a4ab9f7f145c94a5eeb950b92b95c3d362baee67.tar.gz vyos-strongswan-a4ab9f7f145c94a5eeb950b92b95c3d362baee67.zip |
Merge tag 'upstream/5.5.0'
Upstream version 5.5.0
Diffstat (limited to 'testing/hosts/default/etc')
-rw-r--r-- | testing/hosts/default/etc/fstab | 1 | ||||
-rw-r--r-- | testing/hosts/default/etc/ssh/sshd_config | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/testing/hosts/default/etc/fstab b/testing/hosts/default/etc/fstab index 12747232e..9b0f70203 100644 --- a/testing/hosts/default/etc/fstab +++ b/testing/hosts/default/etc/fstab @@ -1 +1,2 @@ +/dev/vda1 / ext3 defaults,relatime,barrier=1 0 1 /hostshare /root/shared 9p trans=virtio,version=9p2000.L 0 0 diff --git a/testing/hosts/default/etc/ssh/sshd_config b/testing/hosts/default/etc/ssh/sshd_config index 07b7e78e5..ae2e4cc84 100644 --- a/testing/hosts/default/etc/ssh/sshd_config +++ b/testing/hosts/default/etc/ssh/sshd_config @@ -1,5 +1,6 @@ Port 22 Protocol 2 +Ciphers arcfour HostKey /etc/ssh/ssh_host_rsa_key HostKey /etc/ssh/ssh_host_dsa_key HostKey /etc/ssh/ssh_host_ecdsa_key |