privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

WIP: Consul ACLs #117

Draft
max wants to merge 8 commits from pr-consul-acl into master
pull from: pr-consul-acl
merge into: privatevoid.net:master
Conversation 0 Commits 8 Files changed 7 +4 -2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit feb0b2a40a - Show all commits

6
modules/consul-service-registry/default.nix
View file

@ -12,6 +12,7 @@ let
consulRegisterScript = pkgs.writeShellScript "consul-register" '' consulRegisterScript = pkgs.writeShellScript "consul-register" ''
export CONSUL_HTTP_ADDR='${consulHttpAddr}' export CONSUL_HTTP_ADDR='${consulHttpAddr}'
export CONSUL_HTTP_TOKEN_FILE=/run/locksmith/consul-systemManagementToken
max commented 2024-08-23 01:14:08 +03:00
Outdated
Review
Copy link

This should definitely be statically optional, i.e. can disable ACL support in this module.

This should probably be dynamically optional, i.e. check for the existence of the token file first. This could be useful for registering and/or running distributed Consul services before the ACL bootstrap is complete.

This should definitely be statically optional, i.e. can disable ACL support in this module. This should probably be *dynamically* optional, i.e. check for the existence of the token file first. This could be useful for registering and/or running distributed Consul services before the ACL bootstrap is complete.
while ! ${consul} services register "$1"; do while ! ${consul} services register "$1"; do
sleep 1 sleep 1
done done
@ -19,6 +20,7 @@ let
consulDeregisterScript = pkgs.writeShellScript "consul-deregister" '' consulDeregisterScript = pkgs.writeShellScript "consul-deregister" ''
export CONSUL_HTTP_ADDR='${consulHttpAddr}' export CONSUL_HTTP_ADDR='${consulHttpAddr}'
export CONSUL_HTTP_TOKEN_FILE=/run/locksmith/consul-systemManagementToken
for i in {1..5}; do for i in {1..5}; do
if ${consul} services deregister "$1"; then if ${consul} services deregister "$1"; then
break break
@ -81,8 +83,8 @@ let
}.${mode}; }.${mode};
value = { value = {
direct = { direct = {
after = [ "consul-ready.service" ]; after = [ "consul-ready.target" ];
requires = [ "consul-ready.service" ]; requires = [ "consul-ready.target" ];
max commented 2024-08-23 01:09:38 +03:00
Outdated
Review
Copy link

ugly

ugly
serviceConfig = { serviceConfig = {
ExecStartPost = register servicesJson; ExecStartPost = register servicesJson;
ExecStopPost = deregister servicesJson; ExecStopPost = deregister servicesJson;