motiejus
/
config
1
Fork 0
Code Packages Releases Activity

grafana is now prod

This commit is contained in:
Motiejus Jakštys 2023-08-10 00:26:16 +03:00
parent 98816538d2
commit 76a748e086
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data.nix
View File

@ -91,10 +91,5 @@ rec {
_acme-challenge.grafana 600 CNAME _acme-endpoint.grafana _acme-challenge.grafana 600 CNAME _acme-endpoint.grafana
_acme-endpoint.grafana 600 NS ns._acme-endpoint.grafana _acme-endpoint.grafana 600 NS ns._acme-endpoint.grafana
ns._acme-endpoint.grafana 600 A ${vno1} ns._acme-endpoint.grafana 600 A ${vno1}
grafana1 600 A ${hosts."vno1-oh2.servers.jakst".jakstIP}
_acme-challenge.grafana1 600 CNAME _acme-endpoint.grafana1
_acme-endpoint.grafana1 600 NS ns._acme-endpoint.grafana1
ns._acme-endpoint.grafana1 600 A ${vno1}
''; '';
} }

4
hosts/vno1-oh2/configuration.nix
View File

@ -72,9 +72,9 @@
nsd-acme = { nsd-acme = {
enable = true; enable = true;
zones."grafana1.jakstys.lt" = { zones."grafana.jakstys.lt" = {
accountKey = config.age.secrets.letsencrypt-account-key.path; accountKey = config.age.secrets.letsencrypt-account-key.path;
staging = true; staging = false;
}; };
}; };

10
modules/services/nsd-acme/default.nix
View File

@ -9,7 +9,7 @@
fullZone = "_acme-endpoint.${zone}"; fullZone = "_acme-endpoint.${zone}";
in in
pkgs.writeShellScript "nsd-acme-hook" '' pkgs.writeShellScript "nsd-acme-hook" ''
set -xeuo pipefail set -euo pipefail
METHOD=$1 METHOD=$1
TYPE=$2 TYPE=$2
AUTH=$5 AUTH=$5
@ -48,8 +48,8 @@
cleanup cleanup
;; ;;
failed) failed)
echo "ACME request failed, not cleaning up" echo "ACME request failed, cleaning up"
#cleanup cleanup
;; ;;
esac esac
''; '';
@ -123,9 +123,9 @@ in {
description = "dns-01 acme update for ${zone}"; description = "dns-01 acme update for ${zone}";
path = [pkgs.openssh pkgs.nsd]; path = [pkgs.openssh pkgs.nsd];
preStart = '' preStart = ''
mkdir -p "$STATE_DIRECTORY/${sanitized}/private" mkdir -p "$STATE_DIRECTORY/private"
ln -sf "$CREDENTIALS_DIRECTORY/letsencrypt-account-key" \ ln -sf "$CREDENTIALS_DIRECTORY/letsencrypt-account-key" \
"$STATE_DIRECTORY/${sanitized}/private/key.pem" "$STATE_DIRECTORY/private/key.pem"
''; '';
serviceConfig = { serviceConfig = {
ExecStart = let ExecStart = let