diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-11-13 12:57:56 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-11-13 13:08:17 +0100 |
| commit | c988e6764e98c554ab71ea177d0483f7bfb4d8fe (patch) | |
| tree | a89204fd6aa8ba27e61b203bf2a88e93677091a1 /deployment/systems | |
| parent | 2524787473460db40a95df1ce11f06c6f42fcd13 (diff) | |
deployment: create (deployment keys) module
* deployment/keys.scm:
define a module.
* deployment/keys.scm:
define variables mcdowell-guix and rakan-guix.
* deployment/systems/mcdowell.scm (guix-offload-rakan):
use the new key definition at rakan-guix.
* deployment/systems/rakan.scm (guix-offload-authorizations):
use the new key definitions at mcdowell-guix.
* keys/guix/mcdowell-signing-key.pub:
remove the file.
* keys/guix/rakan-signing-key.pub:
remove the file.
Diffstat (limited to 'deployment/systems')
| -rw-r--r-- | deployment/systems/mcdowell.scm | 10 | ||||
| -rw-r--r-- | deployment/systems/rakan.scm | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm index c238f48..7a5cc02 100644 --- a/deployment/systems/mcdowell.scm +++ b/deployment/systems/mcdowell.scm @@ -2,6 +2,8 @@ ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl> (define-module (deployment systems mcdowell) + #:use-module ( (deployment keys) + #:prefix deployment:keys:) #:use-module ( (gnu packages package-management) #:prefix gnu:packages:package-management:) #:use-module ( (gnu services) @@ -75,11 +77,9 @@ (private-key "/home/marek/.ssh/id_ed25519"))) (define guix-offload-rakan - (let - ( (l-signing-key (local-file "../keys/guix/rakan-signing-key.pub"))) - (gnu:services:base:guix-extension - (authorized-keys (list l-signing-key)) - (build-machines (list rakan-machine))))) + (gnu:services:base:guix-extension + (authorized-keys (list deployment:keys:rakan-guix)) + (build-machines (list rakan-machine)))) (define system (let* diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm index c952472..0f03d65 100644 --- a/deployment/systems/rakan.scm +++ b/deployment/systems/rakan.scm @@ -2,6 +2,8 @@ ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl> (define-module (deployment systems rakan) + #:use-module ( (deployment keys) + #:prefix deployment:keys:) #:use-module ( (gnu services) #:prefix gnu:services:) #:use-module ( (gnu services base) @@ -31,8 +33,7 @@ #:use-module ( (sovereign systems) #:prefix sovereign:systems:) #:use-module ( (users id1000) - #:prefix users:id1000:) - #:use-module (guix gexp)) + #:prefix users:id1000:)) (define system-name "rakan") @@ -62,10 +63,8 @@ (target l-target)))) (define guix-offload-authorizations - (let - ( (l-mcdowell-key (local-file "../keys/guix/mcdowell-signing-key.pub"))) - (gnu:services:base:guix-extension - (authorized-keys (list l-mcdowell-key))))) + (gnu:services:base:guix-extension + (authorized-keys (list deployment:keys:mcdowell-guix)))) (define guix-publish-configuration (gnu:services:base:guix-publish-configuration |