Skip to content

Commit f961371

Browse files
committed
chore: when oriole16 rm timescale plv8 postgis pgvector pgrouting
1 parent 59b44b6 commit f961371

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

ansible/tasks/stage2-setup-postgres.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@
1010
set_fact:
1111
is_psql_oriole_16: "{{ psql_version == 'psql_oriole-16' }}"
1212

13-
- name: Remove 'timescaledb,' from postgresql.conf if oriole-16 build
13+
- name: Remove specified extensions from postgresql.conf if oriole-16 build
1414
ansible.builtin.command:
15-
cmd: sed -i 's/ timescaledb,//g' /etc/postgresql/postgresql.conf
15+
cmd: >
16+
sed -i 's/ timescaledb,//g'
17+
/etc/postgresql/postgresql.conf
1618
when: is_psql_oriole_16 and stage2_nix
1719
become: yes
18-
- name: Remove 'timescaledb,' from supautils.conf
20+
21+
- name: Remove specified extensions from supautils.conf if oriole-16 build
1922
ansible.builtin.command:
20-
cmd: sed -i 's/ timescaledb,//g' /etc/postgresql-custom/supautils.conf
23+
cmd: >
24+
sed -i 's/ timescaledb,//g; s/ vector,//g; s/ plv8,//g; s/ postgis,//g; s/ pgrouting,//g'
25+
/etc/postgresql-custom/supautils.conf
2126
when: is_psql_oriole_16 and stage2_nix
2227
become: yes
23-
2428
- name: Install Postgres from nix binary cache
2529
become: yes
2630
shell: |

flake.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,15 @@
135135
#Where we import and build the orioledb extension, we add on our custom extensions
136136
# plus the orioledb option
137137
#we're not using timescaledb in the orioledb version of supabase extensions
138-
orioleFilteredExtensions = builtins.filter (x: x != ./nix/ext/timescaledb.nix) ourExtensions;
138+
orioleFilteredExtensions = builtins.filter (
139+
x:
140+
x != ./nix/ext/timescaledb.nix &&
141+
x != ./nix/ext/pgvector.nix &&
142+
x != ./nix/ext/plv8.nix &&
143+
x != ./nix/ext/postgis.nix &&
144+
x != ./nix/ext/pgrouting.nix
145+
) ourExtensions;
146+
139147
orioledbExtension = orioleFilteredExtensions ++ [ ./nix/ext/orioledb.nix ];
140148

141149
#this var is a convenience setting to import the orioledb patched version of postgresql

0 commit comments

Comments
 (0)