Skip to content

Commit e0f85ce

Browse files
committed
(WIP) feat: deploy gotrue using system manager
1 parent 2ee7c42 commit e0f85ce

File tree

12 files changed

+177
-122
lines changed

12 files changed

+177
-122
lines changed

ansible/files/gotrue-optimizations.service.j2

Lines changed: 0 additions & 12 deletions
This file was deleted.

ansible/files/gotrue.service.j2

Lines changed: 0 additions & 27 deletions
This file was deleted.

ansible/playbook.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
dest: "00-schema.sql",
1414
}
1515
- { source: "stat_extension.sql", dest: "01-extension.sql" }
16-
16+
1717
environment:
1818
PATH: /usr/lib/postgresql/bin:{{ ansible_env.PATH }}
1919

@@ -40,13 +40,6 @@
4040
import_tasks: tasks/setup-wal-g.yml
4141
when: debpkg_mode or nixpkg_mode or stage2_nix
4242

43-
- name: Install Gotrue
44-
import_tasks: tasks/setup-gotrue.yml
45-
tags:
46-
- install-gotrue
47-
- install-supabase-internal
48-
when: debpkg_mode or nixpkg_mode
49-
5043
- name: Install PostgREST
5144
import_tasks: tasks/setup-postgrest.yml
5245
tags:
@@ -96,7 +89,7 @@
9689
src: files/apt_periodic
9790
dest: /etc/apt/apt.conf.d/10periodic
9891
when: debpkg_mode or nixpkg_mode
99-
92+
10093
- name: Transfer init SQL files
10194
copy:
10295
src: files/{{ item.source }}
@@ -131,13 +124,13 @@
131124
tags:
132125
- install-supabase-internal
133126
when: debpkg_mode or stage2_nix
134-
127+
135128
- name: Finalize AMI
136129
import_tasks: tasks/finalize-ami.yml
137130
tags:
138131
- install-supabase-internal
139132
when: debpkg_mode or nixpkg_mode
140-
133+
141134
- name: Enhance fail2ban
142135
import_tasks: tasks/setup-fail2ban.yml
143136
when: debpkg_mode or nixpkg_mode
@@ -218,7 +211,7 @@
218211
systemctl stop postgresql.service
219212
when: stage2_nix
220213

221-
- name: Remove osquery
214+
- name: Remove osquery
222215
become: yes
223216
shell: |
224217
sudo -u ubuntu bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile remove osquery"

ansible/tasks/setup-gotrue.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

ansible/vars.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ postgrest_release: "13.0.5"
2424
postgrest_arm_release_checksum: sha256:7b4eafdaf76bc43b57f603109d460a838f89f949adccd02f452ca339f9a0a0d4
2525
postgrest_x86_release_checksum: sha256:05be2bd48abee6c1691fc7c5d005023466c6989e41a4fc7d1302b8212adb88b5
2626

27-
gotrue_release: 2.179.0
28-
gotrue_release_checksum: sha1:e985fce00b2720b747e6a04420910015c4967121
29-
3027
aws_cli_release: "2.23.11"
3128

3229
salt_minion_version: 3007

flake.lock

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@
3333
inputs.nixpkgs.follows = "nixpkgs";
3434
};
3535
system-manager = {
36+
# FIXME: remove custom branch when this PR is merged:
37+
# https://github.com/numtide/system-manager/pull/266
3638
url = "github:numtide/system-manager/users";
37-
#url = "git+file:///home/jfroche/projects/numtide/system-manager/fix/return-tmpfile-error";
39+
inputs.nixpkgs.follows = "nixpkgs";
40+
};
41+
gotrue = {
42+
# FIXME: remove custom fork when this PR is merged:
43+
# https://github.com/supabase/auth/pull/2166
44+
url = "github:yvan-sraka/auth";
3845
inputs.nixpkgs.follows = "nixpkgs";
3946
};
4047
};

nix/systemConfigs.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
{ self, inputs, ... }:
1+
{
2+
self,
3+
inputs,
4+
...
5+
}:
26
let
37
mkModules = system: [
8+
self.systemModules.gotrue
49
self.systemModules.postgres
10+
inputs.gotrue.nixosModules.auth
511
(
612
{ pkgs, ... }:
713
{
814
services.nginx.enable = true;
915
nixpkgs.hostPlatform = system;
16+
supabase.services.gotrue.enable = true;
1017
supabase.services.postgres = {
1118
enable = true;
1219
package = self.packages.${system}."psql_17/bin";

nix/systemModules/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
flake = {
77
systemModules = {
88
postgres = ./postgres;
9+
gotrue = ./gotrue.nix;
910
};
1011
};
1112
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ lib, ... }:
2+
{
3+
options.networking.firewall = lib.mkOption {
4+
type = lib.types.attrs;
5+
};
6+
}

0 commit comments

Comments
 (0)