diff --git a/.gitignore b/.gitignore index e986370..e7272a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ result/ .devenv/ +*.gz \ No newline at end of file diff --git a/modules/hosts/janus/README.md b/modules/hosts/janus/README.md index b50c291..70e3b04 100644 --- a/modules/hosts/janus/README.md +++ b/modules/hosts/janus/README.md @@ -37,7 +37,7 @@ Then update public artifacts in repo from generated output: ```shell step certificate fingerprint /tmp/janus-step-ca-bootstrap/step/certs/root_ca.crt ``` -- `modules/hosts/janus/ssh_user_ca.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_user_ca_key.pub` +- `modules/hosts/janus/ssh_user_ca_key.pub` from `/tmp/janus-step-ca-bootstrap/step/certs/ssh_user_ca_key.pub` ## Back up the root CA key offline diff --git a/modules/hosts/janus/intermediate_ca.crt b/modules/hosts/janus/intermediate_ca.crt new file mode 100644 index 0000000..ef150e9 --- /dev/null +++ b/modules/hosts/janus/intermediate_ca.crt @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBuzCCAWKgAwIBAgIQIW2tnzaR3eHv3EzooE+QGjAKBggqhkjOPQQDAjAoMQ4w +DAYDVQQKEwVKYW51czEWMBQGA1UEAxMNSmFudXMgUm9vdCBDQTAeFw0yNTEyMTgw +NjAyMjlaFw0zNTEyMTYwNjAyMjlaMDAxDjAMBgNVBAoTBUphbnVzMR4wHAYDVQQD +ExVKYW51cyBJbnRlcm1lZGlhdGUgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC +AARyjfmHDMD+aOIESYF9v9Pe68aRgINpjRskGdELz4Y5+x7QNHvbZPEdkox0Qbcp +XETmrcrw6fxBnImYJM5/IU0do2YwZDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/ +BAgwBgEB/wIBADAdBgNVHQ4EFgQUZN0zt5HKZLj0YtGTI7ROw8wLCw8wHwYDVR0j +BBgwFoAUaOeW8ssqNrHjz/vM8/rjOJlzVfswCgYIKoZIzj0EAwIDRwAwRAIgE6W7 +yPG7tpLdwAUVF8BtOZV8TEDwmS1gudrcEbgXyXcCIETTUmM4GlN+zxMGYKs6OybN +IxTY4WmviiXMsDoGWm0B +-----END CERTIFICATE----- diff --git a/modules/hosts/janus/ssh_host_ca_key.pub b/modules/hosts/janus/ssh_host_ca_key.pub new file mode 100644 index 0000000..6ea03b2 --- /dev/null +++ b/modules/hosts/janus/ssh_host_ca_key.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNug18oLH0vZxnibXJzMJvTWFPZTnSlhCDDVi+rHhgnIum6ZXQ4SF+VHOOAM5BbzZmMKitNJ5lcrGP15Eur7DzQ= diff --git a/modules/hosts/janus/ssh_user_ca.pub b/modules/hosts/janus/ssh_user_ca_key.pub similarity index 79% rename from modules/hosts/janus/ssh_user_ca.pub rename to modules/hosts/janus/ssh_user_ca_key.pub index 30305af..d591fae 100644 --- a/modules/hosts/janus/ssh_user_ca.pub +++ b/modules/hosts/janus/ssh_user_ca_key.pub @@ -1 +1 @@ -ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNpgz9xYE3K+JeQ7vtDA07iWlp0xTXB+G8MBzX6/RluXs8E6v+ahx90M093EYIOImaW6npWQ0JnFtmZaet5l9Ao= \ No newline at end of file +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNpgz9xYE3K+JeQ7vtDA07iWlp0xTXB+G8MBzX6/RluXs8E6v+ahx90M093EYIOImaW6npWQ0JnFtmZaet5l9Ao= diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix index 2016583..79cafb6 100644 --- a/modules/services/ssh.nix +++ b/modules/services/ssh.nix @@ -21,12 +21,12 @@ in userCA = lib.mkOption { description = "Content for the SSH user CA file (public key)"; type = lib.types.path; - default = ../hosts/janus/ssh_user_ca.pub; + default = ../hosts/janus/ssh_user_ca_key.pub; }; userCAFile = lib.mkOption { description = "String path to the SSh user CA"; type = lib.types.str; - default = "ssh_user_ca.pub"; + default = "ssh_user_ca_key.pub"; }; }; };