Compare commits

...

4 Commits

6 changed files with 15 additions and 9 deletions

View File

@ -6,4 +6,7 @@
((;; primary: "F7BD DC6D BBE6 B16B 2C71 1A02 5FAB 9938 E05B FEC8"
"F8D5 46F3 AF37 EF53 D1B6 48BE 7B4D EB93 212B 3022"
(name "rekahsoft"))))
(name "rekahsoft-rsa"))
(;; primary: "F7BD DC6D BBE6 B16B 2C71 1A02 5FAB 9938 E05B FEC8"
"43B7 0E51 FEA8 5DA2 42F0 FCA9 6C7D 9ACA 8492 B68D"
(name "rekahsoft-ecc"))))

View File

@ -156,7 +156,6 @@
"soapyhackrf" ;; SoapySDR library support for the hackrf one
"lvm2" ;; for lvm2 tools
"nix"
"nss-certs" ;; for HTTPS access
"recutils"
"tmux"))
%base-packages))

View File

@ -20,6 +20,11 @@
(define %automation-user "auto")
(define %guix-key (local-file "../../../.pubkeys/guix-coordinator-key.pub"))
;; Keys used for ssh access
(define %deploy-key (local-file "../../../.pubkeys/deploy-key.pub"))
(define %collin-ecc-key (local-file "../../../.pubkeys/collin-ecc.pub"))
(define %collin-rsa-key (local-file "../../../.pubkeys/collin-rsa.pub"))
(define syslog-configuration
(plain-file "syslog.conf"
"
@ -83,9 +88,9 @@ mail.* -/var/log/maillog
(openssh-configuration
(password-authentication? #f)
(authorized-keys
`(("auto" ,(local-file "../../../.pubkeys/deploy-key.pub"))
("collin" ,(local-file "../../../.pubkeys/collin.pub"))
("root" ,(local-file "../../../.pubkeys/collin.pub"))))))
`(("auto" ,%deploy-key)
("collin" ,%collin-ecc-key ,%collin-rsa-key)
("root" ,%collin-ecc-key ,%collin-rsa-key)))))
(service prometheus-node-exporter-service-type)
(service dhcp-client-service-type)
(service ntp-service-type)
@ -156,8 +161,7 @@ mail.* -/var/log/maillog
(packages
(append
(map specification->package
'("nss-certs"
"recutils"
'("recutils"
"openssh"
"tmux"
"emacs"

View File

@ -296,8 +296,7 @@ PUBLISH-URL."
(list (service cuirass-service-type
(cuirass-configuration
(host "localhost")
(specifications %cuirass-specs)
(use-substitutes? #t)))
(specifications %cuirass-specs)))
%nginx-cache-activation

1
.pubkeys/collin-ecc.pub Normal file
View File

@ -0,0 +1 @@
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLpK0kvNL8avs8jfsijQoQVwqzODFuwUDYHKauUSlX6lGSoUu1SRnQunOPQLDUgxaigxU9eWp29avXaiPZcP85c= openpgp:0x83F96525