From 0cd15949089c3b92c128e92e3dfeb8ecfa78aaba Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 17 Aug 2024 08:41:23 -0300
Subject: Add services for papo-derived projects and for new package syskeep

---
 tests/internet/key.txt          |  1 +
 tests/internet/system.scm       | 41 +++++++++++++++++++++++++++++++----------
 tests/local/etc/postfix/main.cf |  4 ++++
 tests/local/system.scm          |  6 +++---
 4 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 tests/internet/key.txt

(limited to 'tests')

diff --git a/tests/internet/key.txt b/tests/internet/key.txt
new file mode 100644
index 0000000..a39f765
--- /dev/null
+++ b/tests/internet/key.txt
@@ -0,0 +1 @@
+key-contents
diff --git a/tests/internet/system.scm b/tests/internet/system.scm
index 0d9ddcc..c0e5986 100644
--- a/tests/internet/system.scm
+++ b/tests/internet/system.scm
@@ -1,28 +1,49 @@
 (use-modules
-  ((org euandre queue) #:prefix queue:)
+  ((org euandre queue) #:prefix q:)
+  ((org euandre services) #:prefix serv:)
   (gnu))
 (use-package-modules)
 (use-service-modules
   certbot
   cgit
   mail
-  networking)
+  networking
+  security
+  ssh)
+
+(define (path s)
+  (serv:str (dirname (dirname (dirname (current-filename)))) "/" s))
+
+(define +users+
+  `(("user1"   "I'm a user"  ())
+    ("another" "Description" ("wheel") ,(path "tests/internet/key.txt"))))
 
 (operating-system
   (host-name "a-internet-test-host")
+  (skeletons serv:skeletons)
+  (users (append (serv:user-accounts +users+) %base-user-accounts))
   (services
     (append
      (list
+      (service ntp-service-type)
       (service dhcp-client-service-type)
-      (service cgit-service-type queue:cgit-pre-configuration)
-      (service queue:shadow-group-service-type)
-      (service queue:dkimproxyout-service-type)
-      (service queue:cyrus-sasl-service-type)
-      (service queue:dovecot-service-type)
-      (service queue:internet-postfix-service-type)
-      (service certbot-service-type (certbot-configuration))
+      (service fail2ban-service-type)
+      (service serv:binder-service-type)
+      (service serv:glaze-service-type)
+      (service serv:untls-service-type)
+      (service serv:wscat-service-type)
+      (service serv:papod-service-type)
+      (service openssh-service-type (q:openssh-default-configuration (serv:users->keys +users+)))
+      (service certbot-service-type (q:tld-certbot-configuration "tld.local"))
+      (service cgit-service-type q:cgit-pre-configuration)
+      (service serv:syskeep-service-type)
+      (service q:shadow-group-service-type)
+      (service q:dkimproxyout-service-type)
+      (service q:cyrus-sasl-service-type)
+      (service q:dovecot-service-type)
+      (service q:internet-postfix-service-type)
       (service mail-aliases-service-type '()))
-     %base-services))
+     serv:base-services))
   (bootloader
     (bootloader-configuration
       (bootloader grub-bootloader)))
diff --git a/tests/local/etc/postfix/main.cf b/tests/local/etc/postfix/main.cf
index f9eee9e..143ba5a 100644
--- a/tests/local/etc/postfix/main.cf
+++ b/tests/local/etc/postfix/main.cf
@@ -8,6 +8,10 @@ setgid_group = postdrop
 header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } }
 
 mail_spool_directory = /var/mail/
+
+message_size_limit = 102400000
+mailbox_size_limit = 5120000000
+
 smtp_sender_dependent_authentication = yes
 sender_dependent_relayhost_maps = hash:/var/lib/private/postfix/relayhosts-maps
 smtp_sasl_password_maps = hash:/var/lib/private/postfix/sasl-password
diff --git a/tests/local/system.scm b/tests/local/system.scm
index a520ee1..9f9a195 100644
--- a/tests/local/system.scm
+++ b/tests/local/system.scm
@@ -1,5 +1,5 @@
 (use-modules
-  ((org euandre queue) #:prefix queue:)
+  ((org euandre queue) #:prefix q:)
   ((xyz euandreh heredoc) #:prefix heredoc:)
   (gnu))
 (use-package-modules)
@@ -11,8 +11,8 @@
   (services
     (append
      (list
-      (service queue:local-postfix-service-type
-        (queue:postfix-configuration
+      (service q:local-postfix-service-type
+        (q:postfix-configuration
           (main.cf-extra #"-
             smtp_sender_dependent_authentication = yes
             sender_dependent_relayhost_maps = hash:/var/lib/private/postfix/relayhosts-maps
-- 
cgit v1.2.3