From 28d775fbbfb3d83cd9b01f1d9ba447b95801d960 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Thu, 16 Apr 2026 09:09:27 +0300
Subject: frontends: switch goprecords upload to unified script with separate
 token file

Deploy goprecords-upload-client.sh from goprecords/scripts/ instead of the
inline-token template. Token is now stored in /etc/goprecords-upload.token
(mode 600) and the script reads it at runtime. Old goprecords-upload.sh
(token baked in, mode 500) is removed. daily.local entry updated to pass
GOPRECORDS_HOST=<host> as environment variable.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 frontends/Rexfile | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'frontends/Rexfile')

diff --git a/frontends/Rexfile b/frontends/Rexfile
index 09aa426..5ff2275 100644
--- a/frontends/Rexfile
+++ b/frontends/Rexfile
@@ -195,15 +195,19 @@ task 'goprecords_upload',
         return;
     }
 
-    file '/usr/local/bin/goprecords-upload.sh',
-      content => template(
-        './scripts/goprecords-upload.sh.tpl',
-        goprecords_host  => $short,
-        goprecords_token => $token,
-      ),
-      owner => 'root',
-      group => 'wheel',
-      mode  => '500';
+    file '/etc/goprecords-upload.token',
+      content => "$token\n",
+      owner   => 'root',
+      group   => 'wheel',
+      mode    => '600';
+
+    file '/usr/local/bin/goprecords-upload-client.sh',
+      source => './scripts/goprecords-upload-client.sh',
+      owner  => 'root',
+      group  => 'wheel',
+      mode   => '755';
+
+    file '/usr/local/bin/goprecords-upload.sh', ensure => 'absent';
 
     file '/etc/daily.local',
       ensure => 'present',
@@ -211,7 +215,9 @@ task 'goprecords_upload',
       group  => 'wheel',
       mode   => '644';
 
-    append_if_no_such_line '/etc/daily.local', '/usr/local/bin/goprecords-upload.sh';
+    run q{perl -ni -e 'print unless m{^/usr/local/bin/goprecords-upload\.sh$}' /etc/daily.local};
+
+    append_if_no_such_line '/etc/daily.local', "GOPRECORDS_HOST=${short} /usr/local/bin/goprecords-upload-client.sh";
   };
 
 desc 'Setup rsync';
-- 
cgit v1.2.3