implement deployment to akashi

3 files changed, 32 insertions, 3 deletions

diff --git a/deployment/machine.scm b/deployment/machine.scm
index 28e303b..f8a4112 100644
--- a/deployment/machine.scm
+++ b/deployment/machine.scm
@@ -3,6 +3,8 @@
                 #:prefix deployment:machine:ssh:)
   #:use-module ((deployment systems aisaka)
                 #:prefix deployment:systems:aisaka:)
+  #:use-module ((deployment systems akashi)
+                #:prefix deployment:systems:akashi:)
   #:use-module ((gnu machine)
                 #:prefix gnu:machine:)
   #:use-module ((gnu machine ssh)
@@ -16,3 +18,12 @@
 
 (define-public aisaka
   (list aisaka-machine))
+
+(define akashi-machine
+  (gnu:machine:machine
+   (operating-system deployment:systems:akashi:system)
+   (environment      gnu:machine:ssh:managed-host-environment-type)
+   (configuration    deployment:machine:ssh:akashi-configuration)))
+
+(define-public akashi
+  (list akashi-machine))
diff --git a/deployment/machine/ssh.scm b/deployment/machine/ssh.scm
index b63fde7..edeeffd 100644
--- a/deployment/machine/ssh.scm
+++ b/deployment/machine/ssh.scm
@@ -1,6 +1,8 @@
 (define-module (deployment machine ssh)
   #:use-module ((deployment systems aisaka)
                 #:prefix deployment:systems:aisaka:)
+  #:use-module ((deployment systems akashi)
+                #:prefix deployment:systems:akashi:)
   #:use-module ((gnu machine ssh)
                 #:prefix gnu:machine:ssh:))
 
@@ -22,3 +24,19 @@
    (session           (open-machine-ssh-session* (@@ (gnu machine ssh)
                                                      this-machine-ssh-configuration)))
    (host-key          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM0Eh0q54myeSEironEP9DEKl+ownYuH7oSgAVuLIDNt marek@aisaka")))
+
+(define-public akashi-configuration
+  (gnu:machine:ssh:machine-ssh-configuration
+   (host-name         deployment:systems:akashi:system-name)
+   (system            deployment:systems:akashi:architecture)
+   (build-locally?    #t)
+   (authorize?        #t)
+   (allow-downgrades? #f)
+   (safety-checks?    #t)
+   (port              22)
+   (user              "marek")
+   (identity          "./id_ed25519")
+   (session           (open-machine-ssh-session* (@@ (gnu machine ssh)
+                                                     this-machine-ssh-configuration)))
+   (host-key          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtEYtiph2TwshHHSQhLL7A2ZvFMCogWuI8vfS3jLQsm marek@akashi")))
+
diff --git a/users/id1000.scm b/users/id1000.scm
index 17b57cb..5287145 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -534,8 +534,8 @@
   (gnu:home:services:ssh:openssh-host
     (name          "top-level")
     (host-name     "*")
-    (extra-content (string-append "ServerAliveInterval 60\n"
-                                  "ServerAliveCountMax 2\n"))))
+    (extra-content (string-append "ServerAliveInterval 5\n"
+                                  "ServerAliveCountMax 11\n"))))
 
 (define openssh-configuration
   (let
@@ -544,7 +544,7 @@
                                    "[git.marekpasnikowski.pl]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM0Eh0q54myeSEironEP9DEKl+ownYuH7oSgAVuLIDNt\n"
                                    "[www.marekpasnikowski.pl]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM0Eh0q54myeSEironEP9DEKl+ownYuH7oSgAVuLIDNt\n"))
       (l-akashi   (mixed-text-file "akashi-openssh-keys"
-                                   "\n"))
+                                   "akashi ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtEYtiph2TwshHHSQhLL7A2ZvFMCogWuI8vfS3jLQsm\n"))
       (l-marek    (mixed-text-file "marek-openssh-keys"
                                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@aisaka\n"
                                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFzC1VvW6TB4pMuGyfTM36T7Ar7FZqSXc7kCoVDNwtUX marek@akashi\n"