Skip to content

Commit 18d9116

Browse files
committed
fix: settings must be in db init
1 parent 2ff3c01 commit 18d9116

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

ansible/tasks/setup-postgres.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,15 @@
229229
- name: Initialize the database stage2_nix (orioledb)
230230
become: yes
231231
become_user: postgres
232-
shell: source /var/lib/postgresql/.bashrc && /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data initdb -o "--allow-group-access" -o "--username=supabase_admin" -o "--locale-provider=icu" -o "--encoding=UTF-8" -o "--icu-locale=en_US.UTF-8"
233-
args:
234-
executable: /bin/bash
232+
cmd: >
233+
source /var/lib/postgresql/.bashrc && /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data initdb \
234+
-o "--allow-group-access" \
235+
-o "--username=supabase_admin" \
236+
-o "--locale-provider=icu" \
237+
-o "--encoding=UTF-8" \
238+
-o "--icu-locale=en_US.UTF-8" \
239+
-o "--lc-collate=en-US-x-icu" \
240+
-o "--lc-ctype=en-US-x-icu"
235241
environment:
236242
LANG: en_US.UTF-8
237243
LANGUAGE: en_US.UTF-8

ansible/tasks/stage2-setup-postgres.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@
5050
when: is_psql_oriole and stage2_nix
5151
become: yes
5252

53-
- name: Add ICU locale settings
54-
ansible.builtin.lineinfile:
55-
path: /etc/postgresql/postgresql.conf
56-
line: "{{ item }}"
57-
state: present
58-
with_items:
59-
- "lc_collate = 'en-US-x-icu'"
60-
- "lc_ctype = 'en-US-x-icu'"
61-
- "icu_locale = 'en-US'"
62-
when: is_psql_oriole and stage2_nix
63-
become: yes
53+
# TODO PR may need to remove this.
54+
# - name: Add ICU locale settings
55+
# ansible.builtin.lineinfile:
56+
# path: /etc/postgresql/postgresql.conf
57+
# line: "{{ item }}"
58+
# state: present
59+
# with_items:
60+
# - "lc_collate = 'en-US-x-icu'"
61+
# - "lc_ctype = 'en-US-x-icu'"
62+
# - "icu_locale = 'en-US'"
63+
# when: is_psql_oriole and stage2_nix
64+
# become: yes
6465

6566
- name: Install Git for Nix package management
6667
become: yes

0 commit comments

Comments
 (0)