feat: use emissary 2024.3.4-stable.809.4a1a434

feat: use emissary 2024.3.3-stable.1740.7671872
feat: add configurable agent and claim url for status page
2024-03-04 08:14:37 +00:00 · 2024-03-03 17:45:41 +00:00 · 2024-03-01 13:24:51 +01:00 · 2024-03-01 10:46:27 +00:00
4 changed files with 8 additions and 2 deletions
--- a/emissary_release.txt
+++ b/emissary_release.txt
@ -1 +1 @@
-2024.2.29-stable.1433.eee7e60
+2024.3.4-stable.809.4a1a434
--- a/install/emissary-files.mk
+++ b/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
--- a/misc/emissary/config/emissary
+++ b/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 ''
--- a/misc/emissary/init.d/emissary-agent
+++ b/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"
Author	SHA1	Message	Date
Jenkins	af6c9cfbe6	feat: use emissary 2024.3.4-stable.809.4a1a434 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2024-03-04 08:14:37 +00:00
Jenkins	73159308d1	feat: use emissary 2024.3.3-stable.1740.7671872 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2024-03-03 17:45:41 +00:00
William Petit	158ef63f36	feat: add configurable agent and claim url for status page Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details ref arcad/emissary#21	2024-03-01 13:24:51 +01:00
Jenkins	64ef4a1b5c	feat: use emissary 2024.3.1-stable.1041.8f21313 All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2024-03-01 10:46:27 +00:00