Use unified tailnet launcher and fix Zulip RabbitMQ
This commit is contained in:
parent
7567ab194b
commit
8ac1a5c70e
2 changed files with 2 additions and 13 deletions
|
|
@ -244,8 +244,7 @@ in
|
||||||
forgejoClientSecretFile = config.age.secrets.burrowForgejoOidcClientSecret.path;
|
forgejoClientSecretFile = config.age.secrets.burrowForgejoOidcClientSecret.path;
|
||||||
headscaleClientSecretFile = config.age.secrets.burrowHeadscaleOidcClientSecret.path;
|
headscaleClientSecretFile = config.age.secrets.burrowHeadscaleOidcClientSecret.path;
|
||||||
tailscaleClientSecretFile = config.age.secrets.burrowTailscaleOidcClientSecret.path;
|
tailscaleClientSecretFile = config.age.secrets.burrowTailscaleOidcClientSecret.path;
|
||||||
tailscaleAccessGroupName = contributors.groups.users;
|
defaultExternalApplicationSlug = "ts";
|
||||||
defaultExternalApplicationSlug = "tailscale";
|
|
||||||
googleClientIDFile = config.age.secrets.burrowAuthentikGoogleClientId.path;
|
googleClientIDFile = config.age.secrets.burrowAuthentikGoogleClientId.path;
|
||||||
googleClientSecretFile = config.age.secrets.burrowAuthentikGoogleClientSecret.path;
|
googleClientSecretFile = config.age.secrets.burrowAuthentikGoogleClientSecret.path;
|
||||||
googleAccountMapFile = config.age.secrets.burrowAuthentikGoogleAccountMap.path;
|
googleAccountMapFile = config.age.secrets.burrowAuthentikGoogleAccountMap.path;
|
||||||
|
|
|
||||||
|
|
@ -41,20 +41,10 @@ let
|
||||||
rabbitmq = {
|
rabbitmq = {
|
||||||
image = "rabbitmq:4.2";
|
image = "rabbitmq:4.2";
|
||||||
restart = "unless-stopped";
|
restart = "unless-stopped";
|
||||||
command = [
|
|
||||||
"sh"
|
|
||||||
"-euc"
|
|
||||||
''
|
|
||||||
export RABBITMQ_DEFAULT_PASS="$(cat "$RABBITMQ_PASSWORD_FILE")"
|
|
||||||
echo "default_user = $RABBITMQ_DEFAULT_USER" >> /etc/rabbitmq/rabbitmq.conf
|
|
||||||
echo "default_pass = $RABBITMQ_DEFAULT_PASS" >> /etc/rabbitmq/rabbitmq.conf
|
|
||||||
exec docker-entrypoint.sh rabbitmq-server
|
|
||||||
''
|
|
||||||
];
|
|
||||||
secrets = [ "zulip__rabbitmq_password" ];
|
secrets = [ "zulip__rabbitmq_password" ];
|
||||||
environment = {
|
environment = {
|
||||||
RABBITMQ_DEFAULT_USER = "zulip";
|
RABBITMQ_DEFAULT_USER = "zulip";
|
||||||
RABBITMQ_PASSWORD_FILE = "/run/secrets/zulip__rabbitmq_password";
|
RABBITMQ_DEFAULT_PASS_FILE = "/run/secrets/zulip__rabbitmq_password";
|
||||||
};
|
};
|
||||||
volumes = [ "rabbitmq:/var/lib/rabbitmq:rw" ];
|
volumes = [ "rabbitmq:/var/lib/rabbitmq:rw" ];
|
||||||
attach = false;
|
attach = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue