ochenstarik/server-monitor-manager
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases 17 Packages Wiki Activity Actions 2

fix(enrollment): allow agent token cleanup

Browse source
This commit is contained in:
Ochenstarik 2026-08-09 22:26:38 +07:00
parent 481ad615d5
commit dba5261ec5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deploy/ochenstarik-server-monitor-manager.sh
View file

@ -789,7 +789,7 @@ install_agent() {
ensure_system_user "$AGENT_USER" ensure_system_user "$AGENT_USER"
install -d -m 0711 -o root -g root "$ETC_DIR" "$STATE_DIR" install -d -m 0711 -o root -g root "$ETC_DIR" "$STATE_DIR"
install -d -m 0700 -o "$AGENT_USER" -g "$AGENT_USER" "$STATE_DIR/agent" install -d -m 0700 -o "$AGENT_USER" -g "$AGENT_USER" "$STATE_DIR/agent"
install -d -m 0710 -o root -g "$AGENT_USER" "$ENROLLMENT_DIR" install -d -m 0700 -o "$AGENT_USER" -g "$AGENT_USER" "$ENROLLMENT_DIR"
install -d -m 0700 -o root -g root "$STATE_DIR/provisioning/rollback" install -d -m 0700 -o root -g root "$STATE_DIR/provisioning/rollback"
install_tree_atomic "$TEMP_DIR/agent" "$LIB_DIR/agent" "root:root" install_tree_atomic "$TEMP_DIR/agent" "$LIB_DIR/agent" "root:root"
install_tree_atomic "$TEMP_DIR/provisioning-helper" "$LIB_DIR/provisioning-helper" "root:root" install_tree_atomic "$TEMP_DIR/provisioning-helper" "$LIB_DIR/provisioning-helper" "root:root"

2
tests/bootstrap/test-bootstrap-contract.sh
View file

@ -23,7 +23,7 @@ if grep -Fq 'SMM_EnrollToken=$ENROLL_TOKEN' "$bootstrap"; then
exit 1 exit 1
fi fi
grep -Fq 'readonly ENROLLMENT_DIR="${STATE_DIR}-enrollment"' "$bootstrap" grep -Fq 'readonly ENROLLMENT_DIR="${STATE_DIR}-enrollment"' "$bootstrap"
grep -Fq 'install -d -m 0710 -o root -g "$AGENT_USER" "$ENROLLMENT_DIR"' "$bootstrap" grep -Fq 'install -d -m 0700 -o "$AGENT_USER" -g "$AGENT_USER" "$ENROLLMENT_DIR"' "$bootstrap"
grep -Fq 'token_temp="$(mktemp "$ENROLLMENT_DIR/.enroll-token.XXXXXXXX")"' "$bootstrap" grep -Fq 'token_temp="$(mktemp "$ENROLLMENT_DIR/.enroll-token.XXXXXXXX")"' "$bootstrap"
if grep -Fq '$STATE_DIR/enrollment' "$bootstrap"; then if grep -Fq '$STATE_DIR/enrollment' "$bootstrap"; then
printf '%s\n' "enrollment directory is beneath Control-writable state" >&2 printf '%s\n' "enrollment directory is beneath Control-writable state" >&2