Add services for papo-derived projects and for new package syskeepHEADmain

2 files changed, 32 insertions, 10 deletions

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)))