SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-03-23 20:08:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SebastianStork:caebd6e24187e5f699979424c104a0b9abda9e63
Branches Tags
SebastianStork:main
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:testing-srv-core
..
compare: SebastianStork:1a78e2b1f0e9b895ca000b4c5dbe7c38ca6cb45f
Branches Tags
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:main
SebastianStork:testing-srv-core

2 commits
caebd6e241 ... 1a78e2b1f0

Author SHA1 Message Date
SebastianStork
1a78e2b1f0
fairphone: Fix nebula certificate path 2026-02-26 18:51:55 +01:00
SebastianStork
b76aab2cfe
scripts/nebula-recert-host: Refactor 2026-02-26 18:48:51 +01:00
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
external-hosts/fairphone/default.nix
View file

@ -15,8 +15,8 @@
services = { services = {
nebula = { nebula = {
publicKeyFile = ./keys/nebula.pub; publicKeyFile = toString ./keys/nebula.pub;
certificateFile = ./keys/nebula.crt; certificateFile = toString ./keys/nebula.crt;
}; };
syncthing = { syncthing = {

23
scripts/nebula/recert-host.nix
View file

@ -7,16 +7,16 @@
text = '' text = ''
if [[ $# -lt 1 ]] || [[ $# -gt 2 ]]; then if [[ $# -lt 1 ]] || [[ $# -gt 2 ]]; then
echo "Usage: $0 <host> [<ca-key-path>]" echo "Usage: $0 <hostname> [<ca-key-path>]"
exit 1 exit 1
fi fi
host="$1" hostname="$1"
address="$(nix eval --raw ".#allHosts.$host.config.custom.networking.overlay.cidr")" address="$(nix eval --raw ".#allHosts.$hostname.config.custom.networking.overlay.cidr")"
groups="$(nix eval --raw ".#allHosts.$host.config.custom.services.nebula.groups" --apply 'builtins.concatStringsSep ","')" groups="$(nix eval --raw ".#allHosts.$hostname.config.custom.services.nebula.groups" --apply 'builtins.concatStringsSep ","')"
ca_cert='modules/system/services/nebula/ca.crt' ca_cert="$(nix eval --raw ".#allHosts.$hostname.config.custom.services.nebula.caCertificateFile")"
host_pub="$(nix eval --raw ".#allHosts.$host.config.custom.services.nebula.publicKeyFile")" host_pub="$(nix eval --raw ".#allHosts.$hostname.config.custom.services.nebula.publicKeyFile")"
host_cert="$(nix eval --raw ".#allHosts.$host.config.custom.services.nebula.certificateFile")" host_cert="$(nix eval --raw ".#allHosts.$hostname.config.custom.services.nebula.certificateFile")"
host_cert="''${host_cert#*-source/}" host_cert="''${host_cert#*-source/}"
if [[ $# -eq 2 ]]; then if [[ $# -eq 2 ]]; then
@ -34,6 +34,13 @@
fi fi
rm -f "$host_cert" rm -f "$host_cert"
nebula-cert sign -name "$host" -networks "$address" -groups "$groups" -ca-crt "$ca_cert" -ca-key "$ca_key" -in-pub "$host_pub" -out-crt "$host_cert" nebula-cert sign \
-name "$hostname" \
-networks "$address" \
-groups "$groups" \
-ca-crt "$ca_cert" \
-ca-key "$ca_key" \
-in-pub "$host_pub" \
-out-crt "$host_cert"
''; '';
} }