Simon/self-host
1
0
Fork 0
mirror of https://github.com/bitwarden/self-host.git synced 2026-06-28 06:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(azure-marketplace): reset cloud-init state (#518)

Browse Source
This commit is contained in:
Tyler
2026-06-01 18:07:07 -04:00
committed by GitHub
parent cebb3295b5
commit 48495a7b6d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AzureMarketplace/marketplace-image.pkr.hcl
View File

@@ -206,6 +206,9 @@ build {
"sudo tar -xzf /tmp/walinuxagent.tar.gz -C /opt/walinuxagent-src --strip-components=1", "sudo tar -xzf /tmp/walinuxagent.tar.gz -C /opt/walinuxagent-src --strip-components=1",
"cd /opt/walinuxagent-src && sudo python3 setup.py install --register-service", "cd /opt/walinuxagent-src && sudo python3 setup.py install --register-service",
"sudo rm -f /tmp/walinuxagent.tar.gz", "sudo rm -f /tmp/walinuxagent.tar.gz",
# Force systemd to re-read units after setup.py modifies walinuxagent.service.
# The version systemd has loaded is outdated" on first boot.
"sudo systemctl daemon-reload",
"sudo systemctl enable walinuxagent", "sudo systemctl enable walinuxagent",
"waagent --version", "waagent --version",
] ]

8
CommonMarketplace/scripts/90-cleanup.sh
View File

@@ -78,5 +78,11 @@ done
find /var/log -mtime -1 -type f -exec truncate -s 0 {} \; find /var/log -mtime -1 -type f -exec truncate -s 0 {} \;
rm -rf /var/log/*.gz /var/log/*.[0-9] /var/log/*-???????? rm -rf /var/log/*.gz /var/log/*.[0-9] /var/log/*-????????
rm -rf /var/lib/cloud/instances/* # Reset cloud-init state for redeploy. `rm -rf /var/lib/cloud/instances/*` alone
# leaves the /var/lib/cloud/instance symlink dangling, which causes cloud-init
# to enter `degraded done` on the deployed VM's first boot
if command -v cloud-init >/dev/null 2>&1; then
cloud-init clean --logs --machine-id
fi
rm -rf /var/lib/cloud/instance /var/lib/cloud/instances/* /var/lib/cloud/data/* /var/lib/cloud/sem/*
rm -f /root/.ssh/authorized_keys /home/ubuntu/.ssh/authorized_keys rm -f /root/.ssh/authorized_keys /home/ubuntu/.ssh/authorized_keys