Compare commits
6 Commits
v2023.03.2
...
v2023.03.2
Author | SHA1 | Date | |
---|---|---|---|
aa22f3c55b | |||
f6c3de68b2 | |||
1470bea902 | |||
aa314a939f | |||
844c5d0e17 | |||
656081568e |
3
Makefile
3
Makefile
@ -22,7 +22,7 @@ IMAGEBUILDER_CUSTOM_FILES_DIR_PATH := $(IMAGEBUILDER_DIR_PATH)/files
|
|||||||
|
|
||||||
BIN_DIR := "$(shell readlink -f bin)/$(OPENWRT_VERSION)/$(OPENWRT_TARGET)/$(OPENWRT_PROFILE)$(BIN_DIR_NAME_SUFFIX)"
|
BIN_DIR := "$(shell readlink -f bin)/$(OPENWRT_VERSION)/$(OPENWRT_TARGET)/$(OPENWRT_PROFILE)$(BIN_DIR_NAME_SUFFIX)"
|
||||||
|
|
||||||
GITEA_DOWNLOAD_RELEASE_NAME ?= latest
|
GITEA_DOWNLOAD_RELEASE_NAME ?= v2023.3.29-e5b6c5e
|
||||||
EMISSARY_ARCH ?= armv6
|
EMISSARY_ARCH ?= armv6
|
||||||
|
|
||||||
EMISSARY_RECONCILIATION_INTERVAL ?=
|
EMISSARY_RECONCILIATION_INTERVAL ?=
|
||||||
@ -120,6 +120,7 @@ download-emissary-release: tools/gitea-download/bin/gitea-download.sh
|
|||||||
GITEA_DOWNLOAD_ORG="arcad" \
|
GITEA_DOWNLOAD_ORG="arcad" \
|
||||||
GITEA_DOWNLOAD_BASE_URL="https://forge.cadoles.com" \
|
GITEA_DOWNLOAD_BASE_URL="https://forge.cadoles.com" \
|
||||||
GITEA_DOWNLOAD_RELEASE_NAME="$(GITEA_DOWNLOAD_RELEASE_NAME)" \
|
GITEA_DOWNLOAD_RELEASE_NAME="$(GITEA_DOWNLOAD_RELEASE_NAME)" \
|
||||||
|
GITEA_DOWNLOAD_ATTACHMENTS_FILTER="\.tar\.gz$$" \
|
||||||
tools/gitea-download/bin/gitea-download.sh
|
tools/gitea-download/bin/gitea-download.sh
|
||||||
|
|
||||||
tools/gitea-release/bin/gitea-release.sh:
|
tools/gitea-release/bin/gitea-release.sh:
|
||||||
|
@ -12,6 +12,10 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
|
|||||||
mkdir -p files/lib/upgrade/keep.d
|
mkdir -p files/lib/upgrade/keep.d
|
||||||
cp -r misc/emissary/keep.d/* files/lib/upgrade/keep.d/
|
cp -r misc/emissary/keep.d/* files/lib/upgrade/keep.d/
|
||||||
|
|
||||||
|
# Copy profile.d files
|
||||||
|
mkdir -p files/etc/profile.d
|
||||||
|
cp -r misc/emissary/profile.d/* files/etc/profile.d/
|
||||||
|
|
||||||
mkdir -p gitea-dl/emissary-agent_linux_$(EMISSARY_ARCH)
|
mkdir -p gitea-dl/emissary-agent_linux_$(EMISSARY_ARCH)
|
||||||
cd gitea-dl && tar -xzf emissary-agent_*_linux_$(EMISSARY_ARCH).tar.gz -C emissary-agent_linux_$(EMISSARY_ARCH)
|
cd gitea-dl && tar -xzf emissary-agent_*_linux_$(EMISSARY_ARCH).tar.gz -C emissary-agent_linux_$(EMISSARY_ARCH)
|
||||||
|
|
||||||
@ -22,9 +26,11 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
|
|||||||
# Patch agent config
|
# Patch agent config
|
||||||
tools/yq/bin/yq -i '.agent.serverUrl = "$${EMISSARY_SERVER_URL}"' files/etc/emissary/agent.yml
|
tools/yq/bin/yq -i '.agent.serverUrl = "$${EMISSARY_SERVER_URL}"' files/etc/emissary/agent.yml
|
||||||
tools/yq/bin/yq -i '.agent.reconciliationInterval = "$${EMISSARY_RECONCILIATION_INTERVAL}"' files/etc/emissary/agent.yml
|
tools/yq/bin/yq -i '.agent.reconciliationInterval = "$${EMISSARY_RECONCILIATION_INTERVAL}"' files/etc/emissary/agent.yml
|
||||||
tools/yq/bin/yq -i '.agent.privateKeyPath = "/etc/emissary/agent-key.json"' files/etc/emissary/agent.yml
|
tools/yq/bin/yq -i '.agent.privateKeyPath = "/data/emissary/agent-key.json"' files/etc/emissary/agent.yml
|
||||||
tools/yq/bin/yq -i '.agent.controllers.persistence.stateFile = "/etc/emissary/agent-state.json"' files/etc/emissary/agent.yml
|
tools/yq/bin/yq -i '.agent.controllers.persistence.stateFile = "/data/emissary/agent-state.json"' files/etc/emissary/agent.yml
|
||||||
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.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
|
||||||
|
|
||||||
# Copy emissary binary
|
# Copy emissary binary
|
||||||
mkdir -p files/usr/local/bin
|
mkdir -p files/usr/local/bin
|
||||||
@ -32,10 +38,10 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
|
|||||||
chmod +x files/usr/local/bin/emissary
|
chmod +x files/usr/local/bin/emissary
|
||||||
|
|
||||||
# Set defaults
|
# Set defaults
|
||||||
mkdir -p files/etc/emissary
|
mkdir -p files/data/emissary
|
||||||
rm -rf files/etc/emissary/default.conf
|
rm -rf files/data/emissary/default.conf
|
||||||
echo "EMISSARY_RECONCILIATION_INTERVAL='$(EMISSARY_RECONCILIATION_INTERVAL)'" > files/etc/emissary/default.conf
|
echo "EMISSARY_RECONCILIATION_INTERVAL='$(EMISSARY_RECONCILIATION_INTERVAL)'" > files/data/emissary/default.conf
|
||||||
echo "EMISSARY_SERVER_URL='$(EMISSARY_SERVER_URL)'" >> files/etc/emissary/default.conf
|
echo "EMISSARY_SERVER_URL='$(EMISSARY_SERVER_URL)'" >> files/data/emissary/default.conf
|
||||||
|
|
||||||
# Compress emissary binary
|
# Compress emissary binary
|
||||||
tools/upx/bin/upx -9 files/usr/local/bin/emissary
|
tools/upx/bin/upx -9 files/usr/local/bin/emissary
|
@ -1,3 +1,4 @@
|
|||||||
/etc/machine-id
|
/etc/machine-id
|
||||||
/etc/emissary/agent-key.json
|
/data/emissary/agent-key.json
|
||||||
/etc/emissary/agent-state.json
|
/data/emissary/agent-state.json
|
||||||
|
/data/emissary/apps/data
|
||||||
|
3
misc/emissary/profile.d/99-emissary.sh
Normal file
3
misc/emissary/profile.d/99-emissary.sh
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
export PATH="${PATH}:/usr/local/bin"
|
@ -3,7 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
local default_config="/etc/emissary/default.conf"
|
local default_config="/data/emissary/default.conf"
|
||||||
|
|
||||||
if [ ! -f "${default_config}" ]; then
|
if [ ! -f "${default_config}" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -6,7 +6,8 @@ ssh-copy-id root@${OPENWRT_DEVICE}
|
|||||||
|
|
||||||
TARGET_ARCH=$(ssh root@${OPENWRT_DEVICE} source /etc/os-release \&\& echo \${OPENWRT_BOARD:-\$LEDE_BOARD})
|
TARGET_ARCH=$(ssh root@${OPENWRT_DEVICE} source /etc/os-release \&\& echo \${OPENWRT_BOARD:-\$LEDE_BOARD})
|
||||||
|
|
||||||
FIRMWARE_FILE=bin/${OPENWRT_VERSION}/${TARGET_ARCH}/${OPENWRT_PROFILE}/openwrt-*-sysupgrade.img*
|
FIRMWARE_FILENAME=${FIRMWARE_FILENAME:-openwrt-*-sysupgrade.img*}
|
||||||
|
FIRMWARE_FILE=bin/${OPENWRT_VERSION}/${TARGET_ARCH}/${OPENWRT_PROFILE}/${FIRMWARE_FILENAME}
|
||||||
FIRMWARE_FILE=${CUSTOM_FIRMWARE_FILE:-$FIRMWARE_FILE}
|
FIRMWARE_FILE=${CUSTOM_FIRMWARE_FILE:-$FIRMWARE_FILE}
|
||||||
|
|
||||||
ssh root@${OPENWRT_DEVICE} \
|
ssh root@${OPENWRT_DEVICE} \
|
||||||
|
@ -6,6 +6,6 @@ omnia:
|
|||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
ADDITIONAL_INSTALL="" \
|
ADDITIONAL_INSTALL="" \
|
||||||
OPENWRT_TARGET="mvebu/cortexa9" \
|
OPENWRT_TARGET="mvebu/cortexa9" \
|
||||||
EMISSARY_ARCH="armv6" \
|
EMISSARY_ARCH="armv7" \
|
||||||
OPENWRT_PROFILE="cznic_turris-omnia" \
|
OPENWRT_PROFILE="cznic_turris-omnia" \
|
||||||
build
|
build
|
Reference in New Issue
Block a user