From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB82966484 for ; Fri, 6 Nov 2020 11:03:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD4A51F91A for ; Fri, 6 Nov 2020 11:03:46 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F166B1F90B for ; Fri, 6 Nov 2020 11:03:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BBC9B4605E for ; Fri, 6 Nov 2020 11:03:45 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 6 Nov 2020 11:03:42 +0100 Message-Id: <20201106100343.12161-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201106100343.12161-1-d.csapak@proxmox.com> References: <20201106100343.12161-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.401 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox-backup-proxy.rs] Subject: [pbs-devel] [PATCH proxmox-backup 5/6] proxmox-backup-proxy: add cache parameter to index X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 10:03:46 -0000 for efficiency, use only one mtime value per debian package (this should change when a new version gets installed) Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-proxy.rs | 10 +++++++++- www/index.hbs | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index d4425adc..336eacd1 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -94,7 +94,15 @@ async fn run() -> Result<(), Error> { let mut indexpath = PathBuf::from(buildcfg::JS_DIR); indexpath.push("index.hbs"); - config.register_template("index", &indexpath, &[])?; + + // TODO: get filenames automatically from template? + config.register_template("index", &indexpath, &[ + "/js/proxmox-backup-gui.js", + "/widgettoolkit/proxmoxlib.js", + "/extjs/ext-all.js", + "/fontawesome/css/font-awesome.css", + "/locale/pbs-lang-de.js", // we have to choose a file that we know exists + ])?; config.register_template("console", "/usr/share/pve-xtermjs/index.html.hbs", &[])?; let mut commando_sock = server::CommandoSocket::new(server::our_ctrl_sock()); diff --git a/www/index.hbs b/www/index.hbs index 008e2410..93df4fc0 100644 --- a/www/index.hbs +++ b/www/index.hbs @@ -7,22 +7,22 @@ {{ NodeName }} - Proxmox Backup Server - - - - - + + + + + {{#if language}} - + {{else}} {{/if}} {{#if debug}} - - + + {{else}} - - + + {{/if}} - - + + - + -- 2.20.1