[pbs-devel] [PATCH proxmox-backup 5/6] proxmox-backup-proxy: add cache parameter to index

[Dominik Csapak]

for efficiency, use only one mtime value per debian package
(this should change when a new version gets installed)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 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 @@
     <title>{{ NodeName }} - Proxmox Backup Server</title>
     <link rel="icon" sizes="128x128" href="/images/logo-128.png" />
     <link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
-    <link rel="stylesheet" type="text/css" href="/extjs/theme-crisp/resources/theme-crisp-all.css" />
-    <link rel="stylesheet" type="text/css" href="/extjs/crisp/resources/charts-all.css" />
-    <link rel="stylesheet" type="text/css" href="/fontawesome/css/font-awesome.css" />
-    <link rel="stylesheet" type="text/css" href="/widgettoolkit/css/ext6-pmx.css" />
-    <link rel="stylesheet" type="text/css" href="/css/ext6-pbs.css" />
+    <link rel="stylesheet" type="text/css" href="/extjs/theme-crisp/resources/theme-crisp-all.css?t={{lookup times "ext-all.js"}}" />
+    <link rel="stylesheet" type="text/css" href="/extjs/crisp/resources/charts-all.css?t={{lookup times "ext-all.js"}}" />
+    <link rel="stylesheet" type="text/css" href="/fontawesome/css/font-awesome.css?t={{lookup times "font-awesome.css"}}" />
+    <link rel="stylesheet" type="text/css" href="/widgettoolkit/css/ext6-pmx.css?t={{lookup times "proxmoxlib.js"}}" />
+    <link rel="stylesheet" type="text/css" href="/css/ext6-pbs.css?t={{lookup times "proxmox-backup-gui.js"}}" />
     {{#if language}}
-    <script type='text/javascript' src='/locale/pbs-lang-{{ language }}.js'></script>
+	<script type='text/javascript' src='/locale/pbs-lang-{{ language }}.js?t={{lookup times "pbs-lang-de.js"}}'></script>
     {{else}}
     <script type='text/javascript'> function gettext(buf) { return buf; } </script>
     {{/if}}
     {{#if debug}}
-    <script type="text/javascript" src="/extjs/ext-all-debug.js"></script>
-    <script type="text/javascript" src="/extjs/charts-debug.js"></script>
+    <script type="text/javascript" src="/extjs/ext-all-debug.js?t={{lookup times "ext-all.js"}}"></script>
+    <script type="text/javascript" src="/extjs/charts-debug.js?t={{lookup times "ext-all.js"}}"></script>
     {{else}}
-    <script type="text/javascript" src="/extjs/ext-all.js"></script>
-    <script type="text/javascript" src="/extjs/charts.js"></script>
+    <script type="text/javascript" src="/extjs/ext-all.js?t={{lookup times "ext-all.js"}}"></script>
+    <script type="text/javascript" src="/extjs/charts.js?t={{lookup times "ext-all.js"}}"></script>
     {{/if}}
     <script type="text/javascript">
     Proxmox = {
@@ -32,12 +32,12 @@
 	CSRFPreventionToken: "{{ CSRFPreventionToken }}",
     };
     </script>
-    <script type="text/javascript" src="/widgettoolkit/proxmoxlib.js"></script>
-    <script type="text/javascript" src="/extjs/locale/locale-en.js"></script>
+    <script type="text/javascript" src="/widgettoolkit/proxmoxlib.js?t={{lookup times "proxmoxlib.js"}}"></script>
+    <script type="text/javascript" src="/extjs/locale/locale-en.js?t={{lookup times "ext-all.js"}}"></script>
     <script type="text/javascript">
       Ext.History.fieldid = 'x-history-field';
     </script>
-    <script type="text/javascript" src="/js/proxmox-backup-gui.js"></script>
+      <script type="text/javascript" src="/js/proxmox-backup-gui.js?t={{lookup times "proxmox-backup-gui.js"}}"></script>
   </head>
   <body>
     <!-- Fields required for history management -->
-- 
2.20.1