depend on pve-docs package

and serve documentation files with pveproxy:

https://<HOST>:8006/pve-docs/index.html

diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm
index a96518af52fb7616b428c11837b26d6a72fbc102..fbf8cc53c2e7592a27ad797724b70b9976b39f5d 100755 (executable)
--- 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 9ed653bca63d78b230b0b7cc1197e949f7b5cdd3..215b05c1bd51c4d66904f38cde5ed9a8b2fa13eb 100755 (executable)
--- 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 2839bae2107b99addec98bdad61de4a34a62962a..f694dc7f8eb01c67860268ef57c1c3c267eb378f 100644 (file)
--- 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