chore: fix edgecases

Author: pcnc

.github/workflows/ami-release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Build AMI
         run: |
           GIT_SHA=${{github.sha}}
-          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var "ansible_arguments=''"  amazon-arm64.pkr.hcl
+          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var "ansible_arguments="  amazon-arm64.pkr.hcl
 
       - name: Grab release version
         id: process_release_version

ebssurrogate/scripts/surrogate-bootstrap.sh

@@ -212,7 +212,7 @@ callbacks_enabled = timer, profile_tasks, profile_roles
 EOF
 	# Run Ansible playbook
 	#export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_DEBUG=True && export ANSIBLE_REMOTE_TEMP=/mnt/tmp 
-	export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp 
+	export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp
 	ansible-playbook -c chroot -i '/mnt,' /tmp/ansible-playbook/ansible/playbook.yml $ARGS
 }
 
@@ -245,20 +245,27 @@ function clean_system {
 	touch /mnt/var/log/auth.log
 
 	touch /mnt/var/log/pgbouncer.log
-	chroot /mnt /usr/bin/chown pgbouncer:postgres /var/log/pgbouncer.log
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown pgbouncer:postgres /var/log/pgbouncer.log
+	fi
 
 	# Setup postgresql logs
 	mkdir -p /mnt/var/log/postgresql
-	chroot /mnt /usr/bin/chown postgres:postgres /var/log/postgresql
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown postgres:postgres /var/log/postgresql
+	fi
 
 	# Setup wal-g logs
 	mkdir /mnt/var/log/wal-g
 	touch /mnt/var/log/wal-g/{backup-push.log,backup-fetch.log,wal-push.log,wal-fetch.log}
-	chroot /mnt /usr/bin/chown -R postgres:postgres /var/log/wal-g
-	chroot /mnt /usr/bin/chmod -R 0300 /var/log/wal-g
 
-        # audit logs directory for apparmor
-        mkdir /mnt/var/log/audit
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown -R postgres:postgres /var/log/wal-g
+		chroot /mnt /usr/bin/chmod -R 0300 /var/log/wal-g
+	fi
+
+	# audit logs directory for apparmor
+	mkdir /mnt/var/log/audit
 
 	# unwanted files
 	rm -rf /mnt/var/lib/apt/lists/*