feat: use emissary 2023.12.1-stable.1421.3c3d7fe

Makefile

@@ -5,7 +5,7 @@ GIT_VERSION := $(shell git describe --always)
 DATE_VERSION := $(shell date +%Y.%m.%d)
 FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)
 
-OPENWRT_VERSION ?= 22.03.2
+OPENWRT_VERSION ?= 23.05.2
 OPENWRT_TARGET ?= mvebu/cortexa9
 OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
 OPENWRT_PROFILE ?= linksys_wrt1200ac
@@ -110,7 +110,7 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
-		GITEA_RELEASE_BODY="With Emissary $(EMISSARY_RELEASE)" \
+		GITEA_RELEASE_BODY='Based on OpenWRT [`$(OPENWRT_VERSION)`](https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/) and with Emissary [`$(EMISSARY_RELEASE)`](https://forge.cadoles.com/arcad/emissary/releases/tag/$(EMISSARY_RELEASE))' \
 		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh
 

emissary_release.txt

@@ -1 +1 @@
-2023.10.3-stable.538.9068203
+2023.12.1-stable.1421.3c3d7fe

install/emissary-files.mk

@@ -31,6 +31,8 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
 	tools/yq/bin/yq -i '.agent.controllers.sysupgrade.firmwareVersionCommand = ["sh", "-c", "source /etc/emissary_firmware && echo \"$$FIRMWARE_VERSION\""]' files/etc/emissary/agent.yml
 	tools/yq/bin/yq -i '.agent.controllers.app.dataDir = "/data/emissary/apps/data"' files/etc/emissary/agent.yml
 	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
 
 	# Copy emissary binary
 	mkdir -p files/usr/local/bin

misc/emissary/config/emissary

@@ -2,4 +2,6 @@ package emissary
 
 config main 'agent'
     option reconciliation_interval '60'
-    option server_url 'https://emissary.cadol.es'
+    option server_url 'https://emissary.cadol.es'
+    option sentry_dsn ''
+    option sentry_environment ''

misc/emissary/init.d/emissary-agent

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 USE_PROCD=1
-START=50
+START=99
 STOP=50
 
 start_service() {
@@ -12,15 +12,17 @@ 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_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"
+  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 command /usr/local/bin/emissary
   procd_append_param command --workdir /usr/share/emissary
   procd_append_param command --config "$config_file"
   procd_append_param command agent run
-  procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+  procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-17280}
   procd_set_param file "$config_file"
   procd_set_param stdout 1
   procd_set_param stderr 1

misc/emissary/uci-defaults/99-emissary.sh

@@ -17,6 +17,12 @@ main() {
     if [ ! -z "${EMISSARY_SERVER_URL}" ]; then
         uci set "emissary.agent.server_url=${EMISSARY_SERVER_URL}"
     fi
+    if [ ! -z "${EMISSARY_SENTRY_DSN}" ]; then
+        uci set "emissary.agent.sentry_dsn=${EMISSARY_SENTRY_DSN}"
+    fi
+    if [ ! -z "${EMISSARY_SENTRY_ENVIRONMENT}" ]; then
+        uci set "emissary.agent.sentry_environment=${EMISSARY_SENTRY_ENVIRONMENT}"
+    fi
 
     # Commit modifications
     uci commit

targets/bananapi.mk

@@ -2,8 +2,6 @@ all: bpi-r3
 
 bpi-r3:
 	$(MAKE) \
-		OPENWRT_VERSION="23.05.0-rc4" \
-		IMAGEBUILDER_URL=https://downloads.openwrt.org/releases/23.05.0-rc4/targets/mediatek/filogic/openwrt-imagebuilder-23.05.0-rc4-mediatek-filogic.Linux-x86_64.tar.xz \
 		ADDITIONAL_INSTALL="install-bpi-r3-network-config" \
 		ADDITIONAL_OPENWRT_PACKAGES="block-mount kmod-fs-ext4 kmod-usb-storage kmod-usb2" \
 		OPENWRT_TARGET="mediatek/filogic" \