Move machine specification outside of channel

'guix deploy' would not function when machine-ssh-configuration's identity cannot be
specified relative to the file where its defined.
This commit is contained in:
Collin J. Doering 2022-03-22 22:08:58 -04:00
parent 96f147e008
commit 62fe49c921
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
8 changed files with 59 additions and 65 deletions

View File

@ -1,15 +1,13 @@
(define-module (rekahsoft guix-config vms cloud0-home-rekahsoft-ca)
#:use-module (gnu)
#:use-module (gnu system)
#:use-module (gnu machine)
#:use-module (gnu machine ssh)
#:use-module (gnu packages docker)
#:use-module (gnu packages shells)
#:use-module (gnu packages storage)
#:use-module (gnu services docker)
#:use-module (gnu services shepherd)
#:use-module (rekahsoft guix-config proxmox-vm-lvm-minimal)
#:export (%system %machine))
#:export (%system))
(define base-system (proxmox-vm-lvm-minimal "cloud0"))
@ -64,15 +62,3 @@
(list (service docker-service-type)
cephfs-service)
%proxmox-vm-lvm-minimal-services))))
(define %machine
(machine
(operating-system system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "cloud0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwGi4YmUyLgpmFxJzGQF5Ju7CL8d2Wa2VtHMZGms0KO root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))

View File

@ -1,12 +1,10 @@
(define-module (rekahsoft guix-config vms grocy0-home-rekahsoft-ca)
#:use-module (gnu)
#:use-module (gnu system)
#:use-module (gnu machine)
#:use-module (gnu machine ssh)
#:use-module (gnu packages shells)
#:use-module (gnu services docker)
#:use-module (rekahsoft guix-config proxmox-vm-lvm-minimal)
#:export (%system %machine))
#:export (%system))
(define base-system (proxmox-vm-lvm-minimal "grocy0"))
@ -32,15 +30,3 @@
(append
(list (service docker-service-type))
%proxmox-vm-lvm-minimal-services))))
(define %machine
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "grocy0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICSMBcmFdlDI/JKOBC/RRJh2VM0MY45o684OXaTQ3fGm root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))

View File

@ -1,14 +1,12 @@
(define-module (rekahsoft guix-config vms guix-ci0-home-rekahsoft-ca)
#:use-module (gnu)
#:use-module (gnu system)
#:use-module (gnu machine)
#:use-module (gnu machine ssh)
#:use-module (gnu packages shells)
#:use-module (gnu services base)
#:use-module (gnu services cuirass)
#:use-module (gnu services web)
#:use-module (rekahsoft guix-config proxmox-vm-lvm-minimal)
#:export (%system %machine))
#:export (%system))
(define base-system (proxmox-vm-lvm-minimal "guix-ci0"))
@ -326,15 +324,3 @@ PUBLISH-URL."
)
)"))
(guix-configuration-authorized-keys config))))))))))
(define (%machine ssh-key)
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "guix-ci0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILrv3Ygq47GYt5jYiNPUhvIDOOl4H17Z/abMvA1l/xkj root@(none)")
(system "x86_64-linux")
(port 22)
(user "auto")
(identity ssh-key)))))

View File

@ -1,12 +1,10 @@
(define-module (rekahsoft guix-config vms vault0-home-rekahsoft-ca)
#:use-module (gnu)
#:use-module (gnu system)
#:use-module (gnu machine)
#:use-module (gnu machine ssh)
#:use-module (gnu packages shells)
#:use-module (gnu services docker)
#:use-module (rekahsoft guix-config proxmox-vm-lvm-minimal)
#:export (%system %machine))
#:export (%system))
(define base-system (proxmox-vm-lvm-minimal "vault0"))
@ -27,15 +25,3 @@
(append
(list (service docker-service-type))
%proxmox-vm-lvm-minimal-services))))
(define %machine
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "vault0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwGi4YmUyLgpmFxJzGQF5Ju7CL8d2Wa2VtHMZGms0KO root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))

View File

@ -1 +1,14 @@
(list (@ (rekahsoft guix-config vms cloud0-home-rekahsoft-ca) %machine))
(use-modules
(rekahsoft guix-config vms cloud0-home-rekahsoft-ca))
(list
(machine
(operating-system system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "cloud0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwGi4YmUyLgpmFxJzGQF5Ju7CL8d2Wa2VtHMZGms0KO root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))

View File

@ -1 +1,14 @@
(list (@ (rekahsoft guix-config vms grocy0-home-rekahsoft-ca) %machine))
(use-modules
(rekahsoft guix-config vms grocy0-home-rekahsoft-ca))
(list
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "grocy0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICSMBcmFdlDI/JKOBC/RRJh2VM0MY45o684OXaTQ3fGm root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))

View File

@ -1,3 +1,14 @@
(use-modules
(rekahsoft guix-config vms guix-ci0-home-rekahsoft-ca))
(list
((@ (rekahsoft guix-config vms guix-ci0-home-rekahsoft-ca) %machine)
(canonicalize-path ".deploy-key/key")))
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "guix-ci0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILrv3Ygq47GYt5jYiNPUhvIDOOl4H17Z/abMvA1l/xkj root@(none)")
(system "x86_64-linux")
(port 22)
(user "auto")
(identity ".deploy-key/key")))))

View File

@ -1 +1,14 @@
(list (@ (rekahsoft guix-config vms vault0-home-rekahsoft-ca) %machine))
(use-modules
(rekahsoft guix-config vms vault0-home-rekahsoft-ca))
(list
(machine
(operating-system %system)
(environment managed-host-environment-type)
(configuration (machine-ssh-configuration
(host-name "vault0.home.rekahsoft.ca")
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwGi4YmUyLgpmFxJzGQF5Ju7CL8d2Wa2VtHMZGms0KO root@(none)")
(system "x86_64-linux")
(user "auto")
(identity ".deploy-key/key")
(port 22)))))