Skip to content

Commit d38602e

Browse files
authored
fix: tmp alias until internal pr merges on admin-mgr (#1982)
* fix: tmp alias until internal pr merges on admin-mgr * fix: pgbouncer also needs fix * fix: bump to test * chore: bump to release
1 parent 0842286 commit d38602e

File tree

8 files changed

+20
-10
lines changed

8 files changed

+20
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ common-nix.vars.pkr.hcl
3131
# pre-commit config is managed in nix
3232
.pre-commit-config.yaml
3333
nixos.qcow2
34+
.lsp
35+
.clj-kondo

ansible/files/pgbouncer_config/pgbouncer.service.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Documentation=man:pgbouncer(1)
44
Documentation=https://www.pgbouncer.org/
55
After=network.target
66
{% if supabase_internal is defined %}
7-
Requires=database-optimizations.service
8-
After=database-optimizations.service
7+
Requires=database_optimizations.service
8+
After=database_optimizations.service
99
{% endif %}
1010

1111
[Service]

ansible/tasks/setup-wal-g.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,11 @@
7676
mode: '0664'
7777
owner: 'postgres'
7878
src: 'files/postgresql_config/conf.d/wal-g.conf'
79+
80+
- name: Create symlink for admin-mgr compatibility
81+
ansible.builtin.file:
82+
src: '/etc/postgresql-custom/conf.d/wal-g.conf'
83+
dest: '/etc/postgresql-custom/wal-g.conf'
84+
state: 'link'
85+
owner: 'postgres'
86+
group: 'postgres'

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.022-orioledb"
14-
postgres17: "17.6.1.065"
15-
postgres15: "15.14.1.065"
13+
postgresorioledb-17: "17.6.0.023-orioledb"
14+
postgres17: "17.6.1.066"
15+
postgres15: "15.14.1.066"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.19.0

audit-specs/baselines/ami-build/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ service:
116116
supabase-admin-agent_salt:
117117
enabled: false
118118
running: false
119-
database-optimizations:
119+
database_optimizations:
120120
enabled: false
121121
running: false
122122
postgrest-optimizations:

audit-specs/baselines/baseline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5461,7 +5461,7 @@ file:
54615461
owner: "0"
54625462
group: "0"
54635463
filetype: file
5464-
/etc/systemd/system/database-optimizations.service:
5464+
/etc/systemd/system/database_optimizations.service:
54655465
exists: true
54665466
mode: "0644"
54675467
owner: "0"
@@ -95424,7 +95424,7 @@ service:
9542495424
cron:
9542595425
enabled: true
9542695426
running: true
95427-
database-optimizations:
95427+
database_optimizations:
9542895428
enabled: false
9542995429
running: false
9543095430
dbus:

audit-specs/baselines/prod-deployed/files-systemd-deployed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ file:
5555
group: '0'
5656
mode: '0644'
5757
owner: '0'
58-
/etc/systemd/system/database-optimizations.service:
58+
/etc/systemd/system/database_optimizations.service:
5959
exists: true
6060
filetype: file
6161
group: '0'

audit-specs/baselines/prod-deployed/service-deployed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ service:
4646
cron:
4747
enabled: true
4848
running: true
49-
database-optimizations:
49+
database_optimizations:
5050
enabled: false
5151
running: false
5252
dbus:

0 commit comments

Comments
 (0)