magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-22 08:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Permit unsupported envoy version

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2023-06-19 00:30:07 +02:00
parent de385c1d60
commit 637dc2877f
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/hashicorp-envoy.nix
View file

@ -84,6 +84,13 @@ in
type = types.package; type = types.package;
default = pkgs.envoy; default = pkgs.envoy;
}; };
extraConsulArgs = mkOption {
description = mdDoc ''
'';
type = with types; listOf str;
default = [];
};
}; };
}); });
default = {}; default = {};
@ -127,6 +134,7 @@ in
startEnvoy = pkgs.writeShellScript "start_envoy_${name}.sh" startEnvoy = pkgs.writeShellScript "start_envoy_${name}.sh"
'' ''
exec ${value.consulPackage}/bin/consul connect envoy \ exec ${value.consulPackage}/bin/consul connect envoy \
${concatStringsSep " " value.extraConsulArgs} \
${optionalString (value.type == "normal") '' ${optionalString (value.type == "normal") ''
-sidecar-for ${value.service.id} \ -sidecar-for ${value.service.id} \
''} \ ''} \

1
nixos/systems/blowhole/klipper.nix
View file

@ -106,6 +106,7 @@ in
address = "10.64.99.6:19000"; address = "10.64.99.6:19000";
adminBind = "127.0.0.1:19100"; adminBind = "127.0.0.1:19100";
hotRestart = false; hotRestart = false;
extraConsulArgs = [ "-ignore-envoy-compatibility" ];
}; };
users.users.klipper = { users.users.klipper = {

7
nixos/systems/blowhole/monitoring.nix
View file

@ -231,6 +231,8 @@ in
adminBind = "127.0.0.1:19100"; adminBind = "127.0.0.1:19100";
hotRestart = false; hotRestart = false;
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
extraConsulArgs = [ "-ignore-envoy-compatibility" ];
}; };
services.telegraf-magic = { services.telegraf-magic = {
@ -384,6 +386,8 @@ in
address = "10.64.99.2:19000"; address = "10.64.99.2:19000";
adminBind = "127.0.0.1:19100"; adminBind = "127.0.0.1:19100";
hotRestart = false; hotRestart = false;
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
extraConsulArgs = [ "-ignore-envoy-compatibility" ];
}; };
services.postgresql = { services.postgresql = {
@ -467,6 +471,8 @@ in
address = "10.64.99.2:19001"; address = "10.64.99.2:19001";
adminBind = "127.0.0.1:19101"; adminBind = "127.0.0.1:19101";
hotRestart = false; hotRestart = false;
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
extraConsulArgs = [ "-ignore-envoy-compatibility" ];
}; };
services.influxdb2 = { services.influxdb2 = {
@ -497,6 +503,7 @@ in
address = "10.64.99.2:19002"; address = "10.64.99.2:19002";
adminBind = "127.0.0.1:19102"; adminBind = "127.0.0.1:19102";
hotRestart = false; hotRestart = false;
extraConsulArgs = [ "-ignore-envoy-compatibility" ];
}; };
services.telegraf-magic = { services.telegraf-magic = {