feat: use emissary 2024.3.13-stable.821.cec5c78

ref arcad/emissary#21

emissary_release.txt

@@ -1 +1 @@
-2024.1.12-stable.1306.79f5301
+2024.3.13-stable.821.cec5c78

install/emissary-files.mk

@@ -33,6 +33,8 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
 	tools/yq/bin/yq -i '.agent.controllers.app.downloadDir = "/data/emissary/apps/bundles"' files/etc/emissary/agent.yml
 	tools/yq/bin/yq -i '.sentry.dsn = "$${EMISSARY_SENTRY_DSN}"' files/etc/emissary/agent.yml
 	tools/yq/bin/yq -i '.sentry.environment = "$${EMISSARY_SENTRY_ENVIRONMENT}"' files/etc/emissary/agent.yml
+	tools/yq/bin/yq -i '.agent.controllers.status.claimURL = "$${EMISSARY_CONTROLLERS_STATUS_CLAIM_URL}"' files/etc/emissary/agent.yml
+	tools/yq/bin/yq -i '.agent.controllers.status.agentURL = "$${EMISSARY_CONTROLLERS_STATUS_AGENT_URL}"' files/etc/emissary/agent.yml
 
 	# Copy emissary binary
 	mkdir -p files/usr/local/bin

misc/emissary/config/emissary

@@ -3,5 +3,7 @@ package emissary
 config main 'agent'
     option reconciliation_interval '60'
     option server_url 'https://emissary.cadol.es'
+    option claim_url 'https://emissary.cadol.es/hq/claim/%v'
+    option agent_url 'https://emissary.cadol.es/hq/agents/%v'
     option sentry_dsn ''
     option sentry_environment ''

misc/emissary/init.d/emissary-agent

@@ -12,12 +12,14 @@ start_service() {
 
   config_get emissary_reconciliation_interval agent 'reconciliation_interval' "60"
   config_get emissary_server_url agent 'server_url' "https://emissary.cadol.es"
+  config_get emissary_agent_claim_url agent 'claim_url' "https://emissary.cadol.es/hq/claim/%v"
+  config_get emissary_agent_url agent 'agent_url' "https://emissary.cadol.es/hq/agents/%v"
   config_get emissary_sentry_dsn agent 'sentry_dsn' ""
   config_get emissary_sentry_environment agent 'sentry_environment' ""
 
   local config_file="/etc/emissary/agent.yml"
   procd_open_instance emissary-agent
-  procd_set_param env EMISSARY_SERVER_URL="$emissary_server_url" EMISSARY_RECONCILIATION_INTERVAL="$emissary_reconciliation_interval" EMISSARY_SENTRY_DSN="$emissary_sentry_dsn" EMISSARY_SENTRY_ENVIRONMENT="$emissary_sentry_environment"
+  procd_set_param env EMISSARY_SERVER_URL="$emissary_server_url" EMISSARY_RECONCILIATION_INTERVAL="$emissary_reconciliation_interval" EMISSARY_SENTRY_DSN="$emissary_sentry_dsn" EMISSARY_SENTRY_ENVIRONMENT="$emissary_sentry_environment" EMISSARY_CONTROLLERS_STATUS_CLAIM_URL="$emissary_agent_claim_url" EMISSARY_CONTROLLERS_STATUS_AGENT_URL="$emissary_agent_url"
   procd_set_param command /usr/local/bin/emissary
   procd_append_param command --workdir /usr/share/emissary
   procd_append_param command --config "$config_file"

misc/x86/uci-defaults/99-machine-id.sh

@@ -11,14 +11,13 @@ main() {
     fi
 
     # Accumulate data to create unique machine id
-    local mac_addresses=$(cat /sys/class/net/*/address | uniq | sort)
-    local device_uuid=$(dmidecode | grep UUID)
+    local random_uuid=$(cat /proc/sys/kernel/random/uuid)
 
     # Ensure destination directory
     mkdir -p "$(dirname "$machine_id_file")"
 
     # Generate SHA256 hash of data and save it to $machine_id_file
-    echo "$mac_adresses $device_uuid" | sha256sum | cut -d ' ' -f1 > "$machine_id_file"
+    echo "$random_uuid" | sha256sum | cut -d ' ' -f1 > "$machine_id_file"
 }
 
 main