mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

fix: apparently ':' is not a great character for basic auth

Browse source
This commit is contained in:
oddlama 2023-06-18 16:03:41 +02:00
parent d6af975817
commit 06d5d26dde
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/ward/microvms/grafana/default.nix
View file

@ -115,7 +115,7 @@ in {
url = "https://${sentinelCfg.proxiedDomains.loki}"; url = "https://${sentinelCfg.proxiedDomains.loki}";
orgId = 1; orgId = 1;
basicAuth = true; basicAuth = true;
basicAuthUser = "${nodeName}:grafana-loki-basic-auth-password"; basicAuthUser = "${nodeName}+grafana-loki-basic-auth-password";
secureJsonData.basicAuthPassword = "$__file{${config.age.secrets.grafana-loki-basic-auth-password.path}}"; secureJsonData.basicAuthPassword = "$__file{${config.age.secrets.grafana-loki-basic-auth-password.path}}";
} }
]; ];

3
hosts/ward/microvms/loki/default.nix
View file

@ -41,7 +41,7 @@ in {
file, file,
}: '' }: ''
echo " -> Aggregating "${lib.escapeShellArg host}":"${lib.escapeShellArg name}"" >&2 echo " -> Aggregating "${lib.escapeShellArg host}":"${lib.escapeShellArg name}"" >&2
echo -n ${lib.escapeShellArg host}":"${lib.escapeShellArg name}" " echo -n ${lib.escapeShellArg host}"+"${lib.escapeShellArg name}" "
${decrypt} ${lib.escapeShellArg file} \ ${decrypt} ${lib.escapeShellArg file} \
| ${pkgs.caddy}/bin/caddy hash-password --algorithm bcrypt \ | ${pkgs.caddy}/bin/caddy hash-password --algorithm bcrypt \
|| die "Failure while aggregating caddy basic auth hashes" || die "Failure while aggregating caddy basic auth hashes"
@ -55,7 +55,6 @@ in {
useACMEHost = sentinelCfg.lib.extra.matchingWildcardCert lokiDomain; useACMEHost = sentinelCfg.lib.extra.matchingWildcardCert lokiDomain;
extraConfig = '' extraConfig = ''
import common import common
skip_log
basicauth { basicauth {
import ${sentinelCfg.age.secrets.loki-basic-auth-hashes.path} import ${sentinelCfg.age.secrets.loki-basic-auth-hashes.path}
} }

BIN
hosts/ward/microvms/loki/secrets/loki-basic-auth-hashes.age
View file

Binary file not shown.

2
modules/promtail.nix
View file

@ -48,7 +48,7 @@ in {
clients = [ clients = [
{ {
basic_auth.username = "${nodeName}:promtail-loki-basic-auth-password"; basic_auth.username = "${nodeName}+promtail-loki-basic-auth-password";
basic_auth.password_file = config.age.secrets.promtail-loki-basic-auth-password.path; basic_auth.password_file = config.age.secrets.promtail-loki-basic-auth-password.path;
url = "https://${nodes.${cfg.proxy}.config.proxiedDomains.loki}/loki/api/v1/push"; url = "https://${nodes.${cfg.proxy}.config.proxiedDomains.loki}/loki/api/v1/push";
} }