From 46422e73b86f3c0899345dfdcbbf621771b5f666 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 2 Sep 2026 16:18:23 -0300 Subject: Depend on pkgs and move code there; drop other distros but guix --- tests/internet/system.scm | 54 ++++------------------------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) (limited to 'tests/internet/system.scm') diff --git a/tests/internet/system.scm b/tests/internet/system.scm index a7d090c..b6f5b1c 100644 --- a/tests/internet/system.scm +++ b/tests/internet/system.scm @@ -1,63 +1,17 @@ (use-modules - ((org euandre queue) #:prefix q:) - ((org euandre packages) #:prefix pkg:) + ((org euandre packages) #:prefix packages:) (gnu)) (use-package-modules) -(use-service-modules - certbot - cgit - dns - mail - networking - security - ssh) - -(define (path s) - (string-append (dirname (dirname (dirname (current-filename)))) "/" s)) - -(define +users+ - `(("user1" "I'm a user" ()) - ("another" "Description" ("wheel") ,(path "tests/internet/key.txt")))) - -(define-public papod-service-type - (pkg:service-type-for 'papod - pkg: - (pkg:papod-configuration) - '())) +(use-service-modules) (operating-system (host-name "a-internet-test-host") - (skeletons pkg:skeletons) - (users (append (pkg:user-accounts +users+) %base-user-accounts)) (services (append - (list - (service ntp-service-type) - (service dhcpcd-service-type) - ;; (service fail2ban-service-type) - (service pkg:binder-service-type) - (service pkg:glaze-service-type) - (service pkg:hsts-service-type) - (service pkg:untls-service-type) - (service pkg:wscat-service-type) - (service papod-service-type) - (service knot-service-type - (q:knot-zones-configuration "euandre.org" "1.2.3.4" "1:2:3:4:5:6:7:8")) - (service openssh-service-type - (q:openssh-default-configuration (pkg:users->keys +users+))) - (service certbot-service-type (q:tld-certbot-configuration "tld.local")) - (service cgit-service-type q:cgit-pre-configuration) - (service pkg:syskeep-service-type) - (service pkg:cicd-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 '())) - pkg:base-services)) + (list) + %base-services)) (bootloader (bootloader-configuration (bootloader grub-bootloader))) -- cgit v1.3