Skip to content

Sam/nix and conventional consolidate #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 54 commits into from
Jul 12, 2024
Merged

Sam/nix and conventional consolidate #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e18c74f
feat: consolidate ansible and use vars to toggle AMI builds
samrose Jul 3, 2024
5717efd
fix: resolving merge conflict
samrose Jul 3, 2024
ddc6b1d
chore: merge conflict
samrose Jul 3, 2024
83fd3ed
Revert "chore: merge conflict"
samrose Jul 3, 2024
9dbca39
fix: update ansible location for script
samrose Jul 3, 2024
5a65cdc
fix: ansible consolidated location
samrose Jul 3, 2024
89c6831
fix: set up modes on system-setup
samrose Jul 3, 2024
97a6748
fix: set vars
samrose Jul 3, 2024
16d5e40
fix: python True and False in extra_vars
samrose Jul 3, 2024
9c59812
fix: adj vars
samrose Jul 4, 2024
ccfbffa
fix: set all ami vars
samrose Jul 4, 2024
02f7f4e
fix: args as json
samrose Jul 4, 2024
7460e47
fix: nixpkg_mode
samrose Jul 4, 2024
e3860ec
fix: refining mode rules
samrose Jul 4, 2024
625a2cc
fix: consolidate create dirs
samrose Jul 4, 2024
fb05966
fix: cleaning up modes
samrose Jul 4, 2024
8c76bda
fix: systemd psql service reload targets
samrose Jul 4, 2024
a83bc8b
fix: starting postgres issues
samrose Jul 4, 2024
86f39bd
fix: timing for pgsodium_getkey script
samrose Jul 4, 2024
6ee402e
fix: packer file upload on stage 2
samrose Jul 4, 2024
9460d75
fix: consolidation of ansible location
samrose Jul 5, 2024
197a2e3
fix: stage2 fix hostname
samrose Jul 5, 2024
56327cc
fix: limit stage that tasks run on
samrose Jul 5, 2024
510afe1
fix: setting hosts only on stage 2 nix ami
samrose Jul 5, 2024
dd16965
fix: rewrite hosts in ansible to allow for re-use of playbook file
samrose Jul 5, 2024
eebfcf6
chore: trigger checks
samrose Jul 5, 2024
002cd32
fix: pgsodium getkey is different for deb vs nix builds
samrose Jul 5, 2024
d165ffa
fix: consolidated files location
samrose Jul 5, 2024
feb0db6
fix: on stage2 postgres server is already started at this point
samrose Jul 5, 2024
87891cc
fix: without env vars
samrose Jul 5, 2024
98d91c3
fix: vars on the right mode
samrose Jul 6, 2024
86a129f
fix: dedupe
samrose Jul 6, 2024
831ef50
fix: locales
samrose Jul 6, 2024
c96e28c
fix: locales
samrose Jul 6, 2024
6303303
chore: try step with no env vars
samrose Jul 6, 2024
d6a4851
fix: no need to start pg at this point stage2
samrose Jul 6, 2024
062b236
fix: yaml
samrose Jul 6, 2024
39908ea
fix: more cleanup of modes
samrose Jul 6, 2024
03f41ed
fix: snapd already absent at this point + consolidate tasks
samrose Jul 6, 2024
5659c84
fix: already absent at this point
samrose Jul 6, 2024
0cf650c
fix: service not present at this stage
samrose Jul 6, 2024
cfa0f78
fix: disable different services for first boot depending on mode
samrose Jul 6, 2024
8361e23
fix: pg already restarted at this point in stage 2
samrose Jul 6, 2024
3c2dd37
fix: no start on stage2
samrose Jul 7, 2024
026fa3e
fix: try to start in stage2
samrose Jul 7, 2024
ece9df0
chore: include env vars for stage2
samrose Jul 7, 2024
b12a001
fix: stop before starting
samrose Jul 7, 2024
46af795
fix: debpkg mode only
samrose Jul 7, 2024
0c83c35
fix: should use conventional path
samrose Jul 8, 2024
2de4497
fix: need to locale-gen prior to initdb
samrose Jul 8, 2024
4f8e7a5
fix: nix build needs .env
samrose Jul 8, 2024
b5d6813
fix: stage2 treatment of pgsodium_getket
samrose Jul 9, 2024
828d474
chore: re-introduce permission checks via osquery
samrose Jul 9, 2024
4090305
fix: correct the path to files
samrose Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions amazon-arm64-nix.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ build {
}

provisioner "file" {
source = "ansible-nix"
source = "ansible"
destination = "/tmp/ansible-playbook"
}

Expand All @@ -250,7 +250,7 @@ build {

provisioner "file" {
source = "ansible/vars.yml"
destination = "/tmp/ansible-playbook/ansible-nix/vars.yml"
destination = "/tmp/ansible-playbook/vars.yml"
}

provisioner "shell" {
Expand Down
23 changes: 0 additions & 23 deletions ansible-nix/files/admin_api_scripts/grow_fs.sh
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ansible-nix/files/admin_api_scripts/manage_readonly_mode.sh
View file
Open in desktop

This file was deleted.

132 changes: 0 additions & 132 deletions ansible-nix/files/admin_api_scripts/pg_egress_collect.pl
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ansible-nix/files/admin_api_scripts/pg_upgrade_scripts/check.sh
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions ansible-nix/files/admin_api_scripts/pg_upgrade_scripts/common.sh
View file
Open in desktop

This file was deleted.

Loading