proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-09 03:18:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove spice cert paths

Browse Source 
And depend on pve-qemu-kvm (>= 1.4-16), which automatically uses the correct
certs by default.
This commit is contained in:
Dietmar Maurer 2013-07-23 10:05:36 +02:00
parent 5acbfe9eea
commit d685bd1de8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/QemuServer.pm
View File

@ -2458,14 +2458,9 @@ sub config_to_command {
if ($vga eq 'qxl') { if ($vga eq 'qxl') {
my $pciaddr = print_pci_addr("spice", $bridges); my $pciaddr = print_pci_addr("spice", $bridges);
my $x509 = "x509-key-file=/etc/pve/local/pve-ssl.key" .
",x509-cert-file=/etc/pve/local/pve-ssl.pem" .
",x509-cacert-file=/etc/pve/pve-root-ca.pem";
my $port = PVE::Tools::next_unused_port(61000, 61099); my $port = PVE::Tools::next_unused_port(61000, 61099);
push @$cmd, '-spice', "tls-port=$port,addr=127.0.0.1,$x509,tls-ciphers=DES-CBC3-SHA"; push @$cmd, '-spice', "tls-port=$port,addr=127.0.0.1,tls-ciphers=DES-CBC3-SHA";
push @$cmd, '-device', "virtio-serial,id=spice$pciaddr"; push @$cmd, '-device', "virtio-serial,id=spice$pciaddr";
push @$cmd, '-chardev', "spicevmc,id=vdagent,name=vdagent"; push @$cmd, '-chardev', "spicevmc,id=vdagent,name=vdagent";

2
control.in
View File

@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: @@ARCH@@ Architecture: @@ARCH@@
Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 1.4-4) | pve-qemu-kvm-2.6.18, netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 1.4-16), netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl
Conflicts: netcat-openbsd Conflicts: netcat-openbsd
Maintainer: Proxmox Support Team <support@proxmox.com> Maintainer: Proxmox Support Team <support@proxmox.com>
Description: Qemu Server Tools Description: Qemu Server Tools