john/dendritic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorg

Browse Source
This commit is contained in:
John Lancaster
2026-07-05 11:26:36 -05:00
parent 73f5df1832
commit fa29ce93f4
9 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features/step-client.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let let
defaultCaUrl = "https://janus.john-stream.com/"; defaultCaUrl = "https://janus.john-stream.com/";
defaultFingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6"; defaultFingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
defaultRoot = ../hosts/janus/root_ca.crt; defaultRoot = ../hosts/janus/public/root_ca.crt;
mkStepBootstrap = { pkgs, caUrl, fingerprint, install ? false }: mkStepBootstrap = { pkgs, caUrl, fingerprint, install ? false }:
(inputs.self.wrappers.stepBootstrap.apply { (inputs.self.wrappers.stepBootstrap.apply {
modules/hosts/janus/README.md
+4 -4
View File
@@ -38,14 +38,14 @@ Secret source-of-truth after this split:
Then update public artifacts in repo from generated output: Then update public artifacts in repo from generated output:
- `modules/hosts/janus/root_ca.crt` from `/tmp/janus-step-ca-bootstrap/step/certs/root_ca.crt` - `modules/hosts/janus/public/root_ca.crt` from `/tmp/janus-step-ca-bootstrap/step/certs/root_ca.crt`
- `modules/hosts/janus/intermediate_ca.crt` from `/tmp/janus-step-ca-bootstrap/step/certs/intermediate_ca.crt` (public certificate; intentionally committed, not stored in SOPS) - `modules/hosts/janus/public/intermediate_ca.crt` from `/tmp/janus-step-ca-bootstrap/step/certs/intermediate_ca.crt` (public certificate; intentionally committed, not stored in SOPS)
- `modules/hosts/janus/fingerprint` from: - `modules/hosts/janus/fingerprint` from:
```shell ```shell
step certificate fingerprint /tmp/janus-step-ca-bootstrap/step/certs/root_ca.crt step certificate fingerprint /tmp/janus-step-ca-bootstrap/step/certs/root_ca.crt
``` ```
- `modules/hosts/janus/ssh_user_ca_key.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_user_ca_key.pub` - `modules/hosts/janus/public/ssh_user_ca_key.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_user_ca_key.pub`
- `modules/hosts/janus/ssh_host_ca_key.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_host_ca_key.pub` - `modules/hosts/janus/public/ssh_host_ca_key.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_host_ca_key.pub`
## First boot checks ## First boot checks
modules/hosts/janus/default.nix
+2 -2
View File
@@ -29,8 +29,8 @@ in
extraPrincipals = [ "janus.john-stream.com" ipv4 ipv6 ]; extraPrincipals = [ "janus.john-stream.com" ipv4 ipv6 ];
}; };
step-ca = { step-ca = {
rootCertPath = ./root_ca.crt; rootCertPath = ./public/root_ca.crt;
intermediateCertPath = ./intermediate_ca.crt; intermediateCertPath = ./public/intermediate_ca.crt;
dnsNames = [ dnsNames = [
"${hostname}.john-stream.com" "${hostname}.john-stream.com"
ipv4 ipv4
modules/hosts/janus/fingerprint → modules/hosts/janus/public/fingerprint
View File
modules/hosts/janus/intermediate_ca.crt → modules/hosts/janus/public/intermediate_ca.crt
View File
modules/hosts/janus/root_ca.crt → modules/hosts/janus/public/root_ca.crt
View File
modules/hosts/janus/ssh_host_ca_key.pub → modules/hosts/janus/public/ssh_host_ca_key.pub
View File
modules/hosts/janus/ssh_user_ca_key.pub → modules/hosts/janus/public/ssh_user_ca_key.pub
View File
modules/services/ssh.nix
+1 -2
View File
@@ -1,7 +1,6 @@
{ inputs, ... }: { inputs, ... }:
let let
userName = "john"; sshHostCAPubKeyPath = ../hosts/janus/public/ssh_host_ca_key.pub;
sshHostCAPubKeyPath = ../hosts/janus/ssh_host_ca_key.pub;
in in
{ {
flake.modules.nixos.ssh = { config, pkgs, lib, ... }: flake.modules.nixos.ssh = { config, pkgs, lib, ... }: