feat: use emissary 2024.3.13-stable.821.cec5c78

ref arcad/emissary#21

Makefile

@@ -46,7 +46,7 @@ build: $(IMAGEBUILDER_DIR_PATH) $(IMAGEBUILDER_CUSTOM_PACKAGES_DIR_PATH) $(IMAGE
 
 	# Cleanup old packages signature
 	rm -f $(IMAGEBUILDER_DIR_PATH)/Packages $(IMAGEBUILDER_DIR_PATH)/Packages.gz $(IMAGEBUILDER_DIR_PATH)/Packages.sig
-	
+
 	# Build firmware
 	$(MAKE) \
 		-C "$(IMAGEBUILDER_DIR_PATH)" \
@@ -56,6 +56,7 @@ build: $(IMAGEBUILDER_DIR_PATH) $(IMAGEBUILDER_CUSTOM_PACKAGES_DIR_PATH) $(IMAGE
 		CONFIG_IPV6=n \
 		FILES="$(IMAGEBUILDER_CUSTOM_FILES_DIR_PATH)" \
 		BIN_DIR="$(BIN_DIR)" \
+		ROOTFS_PARTSIZE="$(ROOTFS_PARTSIZE)" \
 		clean image
 
 $(IMAGEBUILDER_DIR_PATH): $(IMAGEBUILDER_ARCHIVE_PATH)

emissary_release.txt

@@ -1 +1 @@
-2023.12.1-stable.1253.32ce5a2
+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/common/uci-defaults/20-emissary-create-data-partition.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+
+MIN_DISK_SPACE_MB=1000
+
+list_disks() {
+    lsblk -o NAME -r -d -n
+}
+
+main() {
+    local disks=$(list_disks)
+
+    local found_free_space=0
+    local found_device=""
+
+    for device_name in ${disks}; do
+        local device="/dev/${device_name}"
+        echo "Checking disk '$device'..."
+        
+        local disk_free_space="$(parted $device unit MB print free 2>/dev/null | grep 'Free Space' | tail -n1 | awk '{ print $3 }')"
+        disk_free_space=${disk_free_space%MB}
+        disk_free_space=$(printf '%.0f' "${disk_free_space:-0}")
+        
+        echo "Free space on disk: ${disk_free_space}"
+
+        if [ ! -z "${disk_free_space}" ]; then
+            if [ ${disk_free_space} -gt ${found_free_space} ]; then
+                found_free_space=${disk_free_space}
+                found_device=${device}
+            fi
+        fi
+    done
+
+    if [ -z "${found_device}" ] || [ ${MIN_DISK_SPACE_MB} -gt ${found_free_space} ]; then
+        echo "No device with sufficient remaining disk space, exiting."
+        exit 1
+    fi
+
+    echo "Creating new partition on '${found_device}' with remaining disk free space"
+
+    local last_partition_end_mb=$(parted "$found_device" unit MB print | awk '/^ [0-9]+ / {start=$3} END {print int(start)}')
+    
+    if [ "${last_partition_end_mb}" != "0" ]; then
+        parted -s "${found_device}" -f -a opt mkpart primary "${last_partition_end_mb}MB" '100%'
+    else
+        parted -s "${found_device}" -f -a opt mkpart primary '0%' '100%'
+    fi
+
+    sync
+
+    local last_partition_number=$(parted ${found_device} print | grep -o -e '^ [0-9]*' | awk '{print $1}' | tail -n 1)
+    local new_partition_device=$(lsblk -r -n -o PARTN,NAME ${found_device} | awk -v partition_number="${last_partition_number}" '$1 == partition_number {print $2}')
+
+    mkfs.ext4 -F /dev/${new_partition_device}
+    if [ $? -ne 0 ]; then
+        echo "Could not initialize filesystem on new partition !"
+        exit 1
+    fi
+    
+    local new_partition_uuid=$(lsblk -r -n -o PARTN,UUID ${found_device} | awk -v partition_number="${last_partition_number}" '$1 == partition_number {print $2}')
+
+    if [ -z "${new_partition_uuid}" ]; then
+        echo "Could not find partition with number '${last_partition_number}' !"
+        exit 1
+    fi
+
+    umount -f /data
+    rm -rf /data
+    mkdir -p /data
+
+    uci add fstab mount
+    uci set fstab.@mount[-1].target='/data'
+    uci set fstab.@mount[-1].uuid=${new_partition_uuid}
+    uci set fstab.@mount[-1].enabled='1'
+    uci commit fstab
+
+    reload_config
+}
+
+main

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

@@ -1,28 +1,30 @@
 #!/bin/sh /etc/rc.common
 
 USE_PROCD=1
-START=50
+START=99
 STOP=50
 
 start_service() {
   config_load emissary
 
   mkdir -p /usr/share/emissary
-  mkdir -p /var/lib/emissary
+  mkdir -p /data/emissary
 
   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"
   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/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

packages.txt

@@ -1,3 +1,8 @@
 luci 
 openssh-server
-openssh-sftp-server
+openssh-sftp-server
+parted
+lsblk
+e2fsprogs
+block-mount
+kmod-fs-ext4