sporestack: rename and move config/docs to properly build channel

diff --git a/infiniteadaptability/systems/sporestack/full-flow-debian-to-guix.md b/infiniteadaptability/systems/sporestack-debian-to-guix.md
similarity index 100%
rename from infiniteadaptability/systems/sporestack/full-flow-debian-to-guix.md
rename to infiniteadaptability/systems/sporestack-debian-to-guix.md

diff --git a/infiniteadaptability/systems/sporestack.scm b/infiniteadaptability/systems/sporestack.scm
new file mode 100644 (file)
index 0000000..ae35e54
--- /dev/null
+++ b/infiniteadaptability/systems/sporestack.scm
@@ -0,0 +1,57 @@
+(define-module (infiniteadaptability systems sporestack)
+  #:use-module (gnu)
+  #:use-module (gnu packages ssh)
+  #:use-module (gnu services networking)
+  #:use-module (gnu services ssh)
+  #:use-module (infiniteadaptability services cloud-init)
+  #:use-module (guix gexp)
+  #:export (%sporestack-operating-system))
+
+(define %ssh-key
+  "[INSERT_SSH_KEY]")
+
+;; use: blkid -s UUID -o value /dev/vda1
+(define %blkid
+  "[INSERT_UUID]")
+
+(define %sporestack-operating-system
+  (operating-system
+    (host-name "guix-test")
+    (timezone "Etc/UTC")
+    (locale "en_US.utf8")
+
+    ;; The supplied layout booted in legacy BIOS mode.
+    ;; Keep Debian's GRUB; installation below uses --no-bootloader.
+    (bootloader (bootloader-configuration
+                  (bootloader grub-bootloader)
+                  (targets '("/dev/vda"))))
+
+    ;; Guix's root is the @guix Btrfs subvolume on /dev/vda1.
+    (file-systems (cons* (file-system
+                           (device (uuid %blkid))
+                           (mount-point "/")
+                           (type "btrfs")
+                           (options "subvol=@guix")) %base-file-systems))
+
+    (services
+     (append (list (service cloud-init-service-type
+                            ;; An example of extra configuration files. This specific
+                            ;; file is required for properly running cloud-init on DigitalOcean
+                            (cloud-init-configuration (extra-configuration-files `
+                                                       (("99-digitalocean.cfg" ,
+                                                         (plain-file
+                                                          "99-digitalocean.cfg"
+                                                          "datasource_list: [ ConfigDrive, DigitalOcean, NoCloud, None ]"))))))
+
+                   (service network-manager-service-type)
+                   (service wpa-supplicant-service-type)
+                   (service openssh-service-type
+                            (openssh-configuration (openssh openssh-sans-x)
+                                                   (permit-root-login 'prohibit-password)
+                                                   (password-authentication?
+                                                                             #f)
+                                                   (authorized-keys `(("root" ,
+                                                                       (plain-file
+                                                                        "auth-key"
+                                                                        %ssh-key)))))))
+             %base-services))))

diff --git a/infiniteadaptability/systems/sporestack/config.scm b/infiniteadaptability/systems/sporestack/config.scm
deleted file mode 100644 (file)
index 0e9475d..0000000
--- a/infiniteadaptability/systems/sporestack/config.scm
+++ /dev/null
@@ -1,50 +0,0 @@
-(use-modules (gnu)
-             (gnu packages ssh)
-             (gnu services networking)
-             (gnu services ssh)
-             (infiniteadaptability services cloud-init)
-             (guix gexp))
-
-(define %ssh-key "[INSERT_SSH_KEY]")
-
-;; use: blkid -s UUID -o value /dev/vda1
-(define %blkid "[INSERT_UUID]")
-
-(operating-system
-  (host-name "guix-test")
-  (timezone "Etc/UTC")
-  (locale "en_US.utf8")
-
-  ;; The supplied layout booted in legacy BIOS mode.
-  ;; Keep Debian's GRUB; installation below uses --no-bootloader.
-  (bootloader (bootloader-configuration
-                (bootloader grub-bootloader)
-                (targets '("/dev/vda"))))
-
-  ;; Guix's root is the @guix Btrfs subvolume on /dev/vda1.
-  (file-systems (cons* (file-system
-                         (device (uuid %blkid))
-                         (mount-point "/")
-                         (type "btrfs")
-                         (options "subvol=@guix")) %base-file-systems))
-
-  (services
-   (append (list (service cloud-init-service-type
-                          ;; An example of extra configuration files. This specific
-                          ;; file is required for properly running cloud-init on DigitalOcean
-                          (cloud-init-configuration (extra-configuration-files `
-                                                     (("99-digitalocean.cfg" ,
-                                                       (plain-file
-                                                        "99-digitalocean.cfg"
-                                                        "datasource_list: [ ConfigDrive, DigitalOcean, NoCloud, None ]"))))))
-
-                 (service network-manager-service-type)
-                 (service wpa-supplicant-service-type)
-                 (service openssh-service-type
-                          (openssh-configuration (openssh openssh-sans-x)
-                                                 (permit-root-login 'prohibit-password)
-                                                 (password-authentication? #f)
-                                                 (authorized-keys `(("root" ,(plain-file
-                                                                              "auth-key"
-                                                                              %ssh-key)))))))
-           %base-services)))