Skip to content

Commit 4afe5f0

Browse files
authored
Sam/nix and conventional consolidate (#1025)
* feat: consolidate ansible and use vars to toggle AMI builds * fix: resolving merge conflict * chore: merge conflict * Revert "chore: merge conflict" This reverts commit ddc6b1d. * fix: update ansible location for script * fix: ansible consolidated location * fix: set up modes on system-setup * fix: set vars * fix: python True and False in extra_vars * fix: adj vars * fix: set all ami vars * fix: args as json * fix: nixpkg_mode * fix: refining mode rules * fix: consolidate create dirs * fix: cleaning up modes * fix: systemd psql service reload targets * fix: starting postgres issues * fix: timing for pgsodium_getkey script * fix: packer file upload on stage 2 * fix: consolidation of ansible location * fix: stage2 fix hostname * fix: limit stage that tasks run on * fix: setting hosts only on stage 2 nix ami * fix: rewrite hosts in ansible to allow for re-use of playbook file * chore: trigger checks * fix: pgsodium getkey is different for deb vs nix builds * fix: consolidated files location * fix: on stage2 postgres server is already started at this point * fix: without env vars * fix: vars on the right mode * fix: dedupe * fix: locales * fix: locales * chore: try step with no env vars * fix: no need to start pg at this point stage2 * fix: yaml * fix: more cleanup of modes * fix: snapd already absent at this point + consolidate tasks * fix: already absent at this point * fix: service not present at this stage * fix: disable different services for first boot depending on mode * fix: pg already restarted at this point in stage 2 * fix: no start on stage2 * fix: try to start in stage2 * chore: include env vars for stage2 * fix: stop before starting * fix: debpkg mode only * fix: should use conventional path * fix: need to locale-gen prior to initdb * fix: nix build needs .env * fix: stage2 treatment of pgsodium_getket * chore: re-introduce permission checks via osquery * fix: correct the path to files --------- Co-authored-by: Sam Rose <samuel@supabase.io>
1 parent d5b4643 commit 4afe5f0

File tree

126 files changed

+317
-5557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+317
-5557
lines changed

amazon-arm64-nix.pkr.hcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ build {
239239
}
240240

241241
provisioner "file" {
242-
source = "ansible-nix"
242+
source = "ansible"
243243
destination = "/tmp/ansible-playbook"
244244
}
245245

@@ -250,7 +250,7 @@ build {
250250

251251
provisioner "file" {
252252
source = "ansible/vars.yml"
253-
destination = "/tmp/ansible-playbook/ansible-nix/vars.yml"
253+
destination = "/tmp/ansible-playbook/vars.yml"
254254
}
255255

256256
provisioner "shell" {

ansible-nix/files/admin_api_scripts/grow_fs.sh

-23
This file was deleted.

ansible-nix/files/admin_api_scripts/manage_readonly_mode.sh

-45
This file was deleted.

ansible-nix/files/admin_api_scripts/pg_egress_collect.pl

-132
This file was deleted.

ansible-nix/files/admin_api_scripts/pg_upgrade_scripts/check.sh

-16
This file was deleted.

ansible-nix/files/admin_api_scripts/pg_upgrade_scripts/common.sh

-63
This file was deleted.

0 commit comments

Comments
 (0)