From fbb6b500ea981b3fe7603288f0496cc3333245bf Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 16 Mar 2023 09:43:31 -0300
Subject: queue.scm: Split postfix-service-type into
 {local,internet}-postfix-service-type

Also add those to `Makefile` as separate targets.

BONUS: better naming of Guix targets in `Makefile`.  Instead of
       `all-{packages,services}`, it is now `guix-{packages,services}`,
       as there are other packages being built that do not belong to
       Guix, and maybe more services in the future.
---
 tests/internet-system.scm | 33 +++++++++++++++++++++++++++++++++
 tests/local-system.scm    | 25 +++++++++++++++++++++++++
 tests/test-system.scm     | 36 ------------------------------------
 3 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 tests/internet-system.scm
 create mode 100644 tests/local-system.scm
 delete mode 100644 tests/test-system.scm

(limited to 'tests')

diff --git a/tests/internet-system.scm b/tests/internet-system.scm
new file mode 100644
index 0000000..1267911
--- /dev/null
+++ b/tests/internet-system.scm
@@ -0,0 +1,33 @@
+(use-modules
+  ((org euandre queue) #:prefix queue:)
+  (gnu))
+(use-package-modules)
+(use-service-modules
+  certbot
+  mail)
+
+(operating-system
+  (host-name "a-internet-test-host")
+  (services
+    (append
+     (list
+      (service queue:shadow-group-service-type)
+      (service queue:dkimproxyout-service-type)
+      (service queue:cyrus-sasl-service-type)
+      (service queue:dovecot2-service-type)
+      (service queue:internet-postfix-service-type)
+      (service certbot-service-type (certbot-configuration))
+      (service mail-aliases-service-type '()))
+     %base-services))
+  (bootloader
+    (bootloader-configuration
+      (bootloader grub-bootloader)))
+  (file-systems
+    (append
+     (list
+      (file-system
+        (mount-point "/")
+        (type "btrfs")
+        (device
+          (uuid "2c66de32-dde7-ea35-750a-a1ca47a58d45" 'btrfs))))
+     %base-file-systems)))
diff --git a/tests/local-system.scm b/tests/local-system.scm
new file mode 100644
index 0000000..abf09a8
--- /dev/null
+++ b/tests/local-system.scm
@@ -0,0 +1,25 @@
+(use-modules
+  ((org euandre queue) #:prefix queue:)
+  (gnu))
+(use-package-modules)
+(use-service-modules)
+
+(operating-system
+  (host-name "a-local-test-host")
+  (services
+    (append
+     (list
+      (service queue:local-postfix-service-type))
+     %base-services))
+  (bootloader
+    (bootloader-configuration
+      (bootloader grub-bootloader)))
+  (file-systems
+    (append
+     (list
+      (file-system
+        (mount-point "/")
+        (type "btrfs")
+        (device
+          (uuid "2c66de32-dde7-ea35-750a-a1ca47a58d45" 'btrfs))))
+     %base-file-systems)))
diff --git a/tests/test-system.scm b/tests/test-system.scm
deleted file mode 100644
index d49541c..0000000
--- a/tests/test-system.scm
+++ /dev/null
@@ -1,36 +0,0 @@
-(use-modules
-  ((org euandre queue) #:prefix queue:)
-  (gnu))
-(use-package-modules
-  ssh)
-(use-service-modules
-  certbot
-  mail
-  networking
-  ssh)
-
-(operating-system
-  (host-name "a-test-host")
-  (services
-    (append
-     (list
-      (service queue:shadow-group-service-type)
-      (service queue:dkimproxyout-service-type)
-      (service queue:cyrus-sasl-service-type)
-      (service queue:dovecot2-service-type)
-      (service queue:postfix-service-type)
-      (service certbot-service-type (certbot-configuration))
-      (service mail-aliases-service-type '()))
-     %base-services))
-  (bootloader
-    (bootloader-configuration
-      (bootloader grub-bootloader)))
-  (file-systems
-    (append
-     (list
-      (file-system
-        (mount-point "/")
-        (type "btrfs")
-        (device
-          (uuid "2c66de32-dde7-ea35-750a-a1ca47a58d45" 'btrfs))))
-     %base-file-systems)))
-- 
cgit v1.2.3