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 87BCE64C78 for ; Tue, 21 Jul 2020 11:11:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82C111650C for ; Tue, 21 Jul 2020 11:10:43 +0200 (CEST) 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 944CA164E9 for ; Tue, 21 Jul 2020 11:10:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 53BB043303 for ; Tue, 21 Jul 2020 11:10:41 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 21 Jul 2020 11:10:39 +0200 Message-Id: <20200721091040.7632-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200721091040.7632-1-d.csapak@proxmox.com> References: <20200721091040.7632-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.012 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an 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. [rest.rs, proxmox-backup-proxy.rs] Subject: [pbs-devel] [PATCH proxmox-backup 4/5] server/rest: add console 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: Tue, 21 Jul 2020 09:11:13 -0000 register the console template and render it when the 'console' parameter is given Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-proxy.rs | 1 + src/server/rest.rs | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 1e93886..a303391 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -56,6 +56,7 @@ async fn run() -> Result<(), Error> { let mut indexpath = PathBuf::from(buildcfg::JS_DIR); indexpath.push("index.hbs"); config.register_template("index", &indexpath)?; + config.register_template("console", "/usr/share/pve-xtermjs/index.html.hbs")?; let rest_server = RestServer::new(config); diff --git a/src/server/rest.rs b/src/server/rest.rs index a7b0a23..09b6848 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -319,11 +319,14 @@ fn get_index(username: Option, token: Option, api: &Arc, token: Option, api: &Arc index, Err(err) => { ct = "text/plain"; format!("Error rendering template: {}", err) - }, + } }; Response::builder() -- 2.20.1