Compare commits

...

14 Commits

Author SHA1 Message Date
c6aa6a8089 feat: use openwrt 23.05.0
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-24 09:02:22 +02:00
2276e202d2 feat(bpi-r3): use openwrt 23.05.0
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-23 09:27:40 +02:00
2caa7781e0 feat: use emissary 2023.10.22-stable.2118.0d2aac4
All checks were successful
arcad/emissary-firmware/pipeline/head This commit looks good
2023-10-22 21:23:20 +00:00
241b9ad3cc feat: use emissary 2023.10.22-stable.2105.38795a9
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-22 21:10:27 +00:00
f7da4a3b74 feat: use emissary 2023.10.22-stable.848.327226a
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-22 08:53:33 +00:00
f93a9cfaca feat: use emissary 2023.10.22-stable.750.fbf818e
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-22 07:54:58 +00:00
acc3c13249 feat: use emissary 2023.10.21-stable.1947.46a853a
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-21 19:52:19 +00:00
abd5cef671 feat: use emissary 2023.10.21-stable.1939.f31a63e
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-21 19:43:47 +00:00
b910fecb21 feat: use emissary 2023.10.20-stable.1539.c8a2303
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-20 15:44:02 +00:00
1ff432c20e feat: use emissary 2023.10.19-stable.2022.ced2658
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-20 09:07:04 +00:00
ae5caf88d3 feat: use emissary 2023.10.13-stable.1222.e756a60
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-13 12:27:28 +00:00
f165301856 feat: use emissary 2023.10.13-stable.1030.752f1ae
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-13 10:35:23 +00:00
50ce5a25ee feat: sentry integration
Some checks reported errors
arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit
2023-10-13 12:29:51 +02:00
b8a8c9257b fix: typo in agent config
All checks were successful
arcad/emissary-firmware/pipeline/head This commit looks good
2023-10-12 23:00:35 +02:00
8 changed files with 19 additions and 7 deletions

View File

@ -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.0
OPENWRT_TARGET ?= mvebu/cortexa9
OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
OPENWRT_PROFILE ?= linksys_wrt1200ac

View File

@ -1 +1 @@
2023.10.3-stable.538.9068203
2023.10.22-stable.2118.0d2aac4

View File

@ -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

View File

@ -4,6 +4,6 @@
- addr
- show
- name: emissary-firmware
commant: cat
command: cat
args:
- /etc/emissary_firmware

View File

@ -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 ''

View File

@ -12,10 +12,12 @@ 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"

View File

@ -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

View File

@ -2,8 +2,8 @@ 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 \
OPENWRT_VERSION="23.05.0" \
IMAGEBUILDER_URL=https://downloads.openwrt.org/releases/23.05.0/targets/mediatek/filogic/openwrt-imagebuilder-23.05.0-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" \