diff options
Diffstat (limited to 'deployment/systems')
| -rw-r--r-- | deployment/systems/aisaka.scm | 14 | ||||
| -rw-r--r-- | deployment/systems/mcdowell.scm | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index 6b071fb..273749f 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -251,10 +251,16 @@ ((@ (gnu services version-control) gitolite-configuration) (rc-file ((@ (gnu services version-control) gitolite-rc-file) (umask #o0027))) - (admin-pubkey (mixed-text-file "gitolite-admin.pub" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFzC1VvW6TB4pMuGyfTM36T7Ar7FZqSXc7kCoVDNwtUX marek@akashi\n" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJew7ti1qr545Z6OUZ/xcNUg7ib6P0pTbSZqFpSvNhKU marek@mcdowell\n" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBo2coChmWHQn9BEbp0dA7DQG7CPEweVcsmnaIVmXyR marek@rakan\n"))))) + (admin-pubkey (directory-union "gitolite-admin-keys.pub" + (list (file-union "akashi" + `( ("gitolite-admin.pub" ,(mixed-text-file "gitolite-admin.pub" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFzC1VvW6TB4pMuGyfTM36T7Ar7FZqSXc7kCoVDNwtUX marek@akashi\n")))) + (file-union "mcdowell" + `( ("gitolite-admin.pub" ,(mixed-text-file "gitolite-admin.pub" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJew7ti1qr545Z6OUZ/xcNUg7ib6P0pTbSZqFpSvNhKU marek@mcdowell\n")))) + (file-union "rakan" + `( ("gitolite-admin.pub" ,(mixed-text-file "gitolite-admin.pub" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBo2coChmWHQn9BEbp0dA7DQG7CPEweVcsmnaIVmXyR marek@rakan\n")))))))))) (define system-keyboard-layout ((@ (gnu system keyboard) keyboard-layout) diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm index 7a5cc02..d1e5766 100644 --- a/deployment/systems/mcdowell.scm +++ b/deployment/systems/mcdowell.scm @@ -94,7 +94,7 @@ gnu:system:linux-initrd:%base-initrd-modules)) (l-services (cons* l-guix-home-service (gnu:services:service gnu:services:ssh:openssh-service-type) - sovereign:packages:protonmail:nogui-profile + ; sovereign:packages:protonmail:nogui-profile (gnu:services:simple-service 'offload-rakan gnu:services:base:guix-service-type guix-offload-rakan) |