From d5d08d2aca99f8feae6c8df01dad8a40f1bf11a8 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 25 May 2016 08:53:56 +0200 Subject: [PATCH] depend on pve-docs package and serve documentation files with pveproxy: https://:8006/pve-docs/index.html --- PVE/HTTPServer.pm | 6 ++++++ PVE/Service/pveproxy.pm | 1 + debian/control.in | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm index a96518af..fbf8cc53 100755 --- a/PVE/HTTPServer.pm +++ b/PVE/HTTPServer.pm @@ -370,6 +370,12 @@ sub send_file_start { } elsif ($filename =~ m/\.ttf$/) { $ct = 'application/font-snft'; $nocomp = 1; + } elsif ($filename =~ m/\.pdf$/) { + $ct = 'application/pdf'; + $nocomp = 1; + } elsif ($filename =~ m/\.epub$/) { + $ct = 'application/epub+zip'; + $nocomp = 1; } else { die "unable to detect content type"; } diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index 9ed653bc..215b05c1 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -79,6 +79,7 @@ sub init { add_dirs($dirs, '/pve2/images/' => '/usr/share/pve-manager/images/'); add_dirs($dirs, '/pve2/css/' => '/usr/share/pve-manager/css/'); add_dirs($dirs, '/pve2/js/' => '/usr/share/pve-manager/js/'); + add_dirs($dirs, '/pve-docs/' => '/usr/share/pve-docs/'); add_dirs($dirs, '/vncterm/' => '/usr/share/vncterm/'); add_dirs($dirs, '/novnc/' => '/usr/share/novnc-pve/'); diff --git a/debian/control.in b/debian/control.in index 2839bae2..f694dc7f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@ Section: admin Priority: optional Architecture: amd64 -Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, ifenslave (>= 2.6), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, liburi-perl, logrotate, libanyevent-http-perl, apt-transport-https, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl, pve-firewall, novnc-pve, libev-perl, systemd, pve-ha-manager, pve-container +Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, ifenslave (>= 2.6), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, liburi-perl, logrotate, libanyevent-http-perl, apt-transport-https, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl, pve-firewall, novnc-pve, libev-perl, systemd, pve-ha-manager, pve-container, pve-docs Conflicts: netcat-openbsd, vzdump, vlan Replaces: vzdump, vlan Provides: vzdump, vlan