File tree Expand file tree Collapse file tree 6 files changed +91
-31
lines changed Expand file tree Collapse file tree 6 files changed +91
-31
lines changed Original file line number Diff line number Diff line change 3838 dbmate-tool = pkgs . callPackage ./dbmate-tool.nix { inherit ( self . supabase ) defaults ; } ;
3939 docker-image-ubuntu = pkgs . callPackage ./docker-ubuntu.nix { } ;
4040 docs = pkgs . callPackage ./docs.nix { } ;
41+ envoy-bin = pkgs . callPackage ./envoy-bin.nix { } ;
4142 supabase-groonga = pkgs . callPackage ./groonga { } ;
4243 local-infra-bootstrap = pkgs . callPackage ./local-infra-bootstrap.nix { } ;
4344 migrate-tool = pkgs . callPackage ./migrate-tool.nix { psql_15 = self' . packages . "psql_15/bin" ; } ;
Original file line number Diff line number Diff line change 1+ {
2+ envoy-bin ,
3+ fetchurl ,
4+ stdenv ,
5+ ...
6+ } :
7+ let
8+ version = "1.28.0" ;
9+ inherit ( stdenv . hostPlatform ) system ;
10+ throwSystem = throw "envoy-bin is not available for ${ system } ." ;
11+ plat =
12+ {
13+ aarch64-linux = "aarch_64" ;
14+ x86_64-linux = "x86_64" ;
15+ }
16+ . ${ system } or throwSystem ;
17+ hash =
18+ {
19+ aarch64-linux = "sha256-65MOMqtVVWQ+CdEdSQ45LQp5DFqA6wsOussQRr27EU0=" ;
20+ x86_64-linux = "sha256-JjlWPOm8CbHua9RzF2C1lsjtHkdM3YPMnfk2RRbhQ2c=" ;
21+ }
22+ . ${ system } or throwSystem ;
23+ in
24+ envoy-bin . overrideAttrs {
25+ inherit version ;
26+ src = fetchurl {
27+ url = "https://github.com/envoyproxy/envoy/releases/download/v${ version } /envoy-${ version } -linux-${ plat } " ;
28+ inherit hash ;
29+ } ;
30+ }
Original file line number Diff line number Diff line change 1- { self , inputs , ... } :
2- let
3- mkModules = system : [
4- ( {
5- services . nginx . enable = true ;
6- nixpkgs . hostPlatform = system ;
7- } )
8- ] ;
9-
10- systems = [
11- "aarch64-linux"
12- "x86_64-linux"
13- ] ;
14-
15- mkSystemConfig = system : {
16- name = system ;
17- value . default = inputs . system-manager . lib . makeSystemConfig {
18- modules = mkModules system ;
19- extraSpecialArgs = {
20- inherit self ;
21- inherit system ;
22- } ;
23- } ;
24- } ;
25- in
26- {
27- flake = {
28- systemConfigs = builtins . listToAttrs ( map mkSystemConfig systems ) ;
29- } ;
30- }
1+ { self , inputs , ... } :
2+ let
3+ mkModules = system : [
4+ ( {
5+ services . nginx . enable = true ;
6+ nixpkgs . hostPlatform = system ;
7+ } )
8+ ] ;
9+
10+ systems = [
11+ "aarch64-linux"
12+ "x86_64-linux"
13+ ] ;
14+
15+ mkSystemConfig = system : {
16+ name = system ;
17+ value . default = inputs . system-manager . lib . makeSystemConfig {
18+ modules = mkModules system ;
19+ extraSpecialArgs = {
20+ inherit self ;
21+ inherit system ;
22+ } ;
23+ } ;
24+ } ;
25+ in
26+ {
27+ flake = {
28+ systemConfigs = builtins . listToAttrs ( map mkSystemConfig systems ) ;
29+ } ;
30+ }
Original file line number Diff line number Diff line change 44{
55 imports = [ ./tests ] ;
66 flake = {
7- systemModules = { } ;
7+ systemModules = {
8+ envoy = ./envoy.nix ;
9+ } ;
810 } ;
911}
Original file line number Diff line number Diff line change 1+ {
2+ lib ,
3+ nixosModulesPath ,
4+ self ,
5+ system ,
6+ ...
7+ } :
8+ {
9+ imports = map ( path : nixosModulesPath + path ) [
10+ "/services/networking/envoy.nix"
11+ ] ;
12+ config = {
13+ services . envoy = {
14+ enable = true ;
15+ package = self . packages . ${ system } . envoy-bin ;
16+ # TODO: settings from postgres/ansible/files/envoy_config/
17+ } ;
18+ systemd . services . envoy = {
19+ wantedBy = lib . mkForce [
20+ "system-manager.target"
21+ ] ;
22+ } ;
23+ } ;
24+ }
Original file line number Diff line number Diff line change 1+ def test_envoy_service (host ):
2+ assert host .service ("envoy.service" ).is_valid
3+ assert host .service ("envoy.service" ).is_running
You can’t perform that action at this time.
0 commit comments