Depend on pkgs and move code there; drop other distros but guix

8 files changed, 4 insertions, 280 deletions

diff --git a/tests/internet/etc/dkimproxyout.conf.in b/tests/internet/etc/dkimproxyout.conf.in
deleted file mode 100644
index 3ee2466..0000000
--- a/tests/internet/etc/dkimproxyout.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-listen 127.0.0.1:10027
-relay 127.0.0.1:10028
-
-domain @HOSTNAME@
-selector dkimproxyout
-
-signature dkim(c=relaxed/relaxed,a=rsa-sha256)
-
-keyfile /var/lib/dkimproxyout/private.key
diff --git a/tests/internet/etc/dovecot/dovecot.conf.in b/tests/internet/etc/dovecot/dovecot.conf.in
deleted file mode 100644
index 6ac013d..0000000
--- a/tests/internet/etc/dovecot/dovecot.conf.in
+++ /dev/null
@@ -1,54 +0,0 @@
-protocols = imap
-
-default_internal_user = dovecot
-default_internal_group = dovecot
-default_login_user = dovenull
-auth_mechanisms = plain login
-auth_username_format = %n
-
-passdb {
-  driver = shadow
-}
-userdb {
-  driver = passwd
-}
-service auth-worker {
-  group = etc-shadow
-}
-
-ssl = required
-ssl_cert = </etc/letsencrypt/live/@HOSTNAME@/fullchain.pem
-ssl_key  = </etc/letsencrypt/live/@HOSTNAME@/privkey.pem
-ssl_dh = </var/lib/dovecot/dhparam.pem
-
-base_dir = /var/run/dovecot
-state_dir = /var/lib/dovecot
-
-verbose_proctitle = yes
-
-mail_location = maildir:/var/mail/%u:INBOX=/var/mail/%u:LAYOUT=fs
-
-namespace inbox {
-  inbox = yes
-  mailbox Drafts {
-    special_use = \Drafts
-    auto = subscribe
-  }
-  mailbox Sent {
-    special_use = \Sent
-    auto = subscribe
-  }
-  mailbox Archive {
-    special_use = \Archive
-    auto = subscribe
-  }
-  mailbox Junk {
-    special_use = \Junk
-    auto = subscribe
-    autoexpunge = 30d
-  }
-  mailbox Trash {
-    special_use = \Trash
-    auto = subscribe
-  }
-}
diff --git a/tests/internet/etc/postfix/main.cf.in b/tests/internet/etc/postfix/main.cf.in
deleted file mode 100644
index 9cc2f4d..0000000
--- a/tests/internet/etc/postfix/main.cf.in
+++ /dev/null
@@ -1,40 +0,0 @@
-compatibility_level = 3.6
-
-queue_directory = /var/spool/postfix
-data_directory = /var/lib/postfix
-mail_owner = postfix
-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
-
-
-myhostname = @HOSTNAME@
-
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/letsencrypt/live/@HOSTNAME@/fullchain.pem
-smtpd_tls_key_file  = /etc/letsencrypt/live/@HOSTNAME@/privkey.pem
-smtp_use_tls       = $smtpd_use_tls
-smtp_tls_cert_file = $smtpd_tls_cert_file
-smtp_tls_key_file  = $smtpd_tls_key_file
-
-smtp_tls_security_level  = may
-
-recipient_delimiter = +
-
-smtpd_sasl_tls_security_options = noanonymous
-smtpd_tls_security_level = may
-smtpd_tls_auth_only = yes
-
-smtpd_relay_restrictions = $smtpd_recipient_restrictions
-smtpd_recipient_restrictions = permit_mynetworks,
-  permit_sasl_authenticated, reject_unauth_destination
-smtpd_sasl_auth_enable = yes
-cyrus_sasl_config_path = /etc/sasl2
-debug_peer_list = 127.0.0.1
-
-milter_default_action = accept
diff --git a/tests/internet/etc/postfix/master.cf b/tests/internet/etc/postfix/master.cf
deleted file mode 100644
index 5c25fd9..0000000
--- a/tests/internet/etc/postfix/master.cf
+++ /dev/null
@@ -1,51 +0,0 @@
-# ============================================================================================================
-# service   type       private  unpriv  chroot  wakeup   maxproc  command + args
-#                      (yes)    (yes)   (no)    (never)  (100)
-# =============================================================================================================
-
-anvil       unix       -        -       n       -        1        anvil
-bounce      unix       -        -       n       -        0        bounce
-cleanup     unix       n        -       n       -        0        cleanup
-defer       unix       -        -       n       -        0        bounce
-discard     unix       -        -       n       -        -        discard
-error       unix       -        -       n       -        -        error
-flush       unix       n        -       n       1000?    0        flush
-lmtp        unix       -        -       n       -        -        lmtp
-local       unix       -        n       n       -        -        local
-pickup      unix       n        -       n       60       1        pickup
-  -o content_filter=dksign:[127.0.0.1]:10027
-proxymap    unix       -        -       n       -        -        proxymap
-proxywrite  unix       -        -       n       -        1        proxymap
-qmgr        unix       n        -       n       300      1        qmgr
-relay       unix       -        -       n       -        -        smtp
-retry       unix       -        -       n       -        -        error
-rewrite     unix       -        -       n       -        -        trivial-rewrite
-scache      unix       -        -       n       -        1        scache
-showq       unix       n        -       n       -        -        showq
-smtp        inet       n        -       n       -        -        smtpd -o syslog_name=postfix/smtp
-smtp        unix       -        -       n       -        -        smtp
-tlsmgr      unix       -        -       n       1000?    1        tlsmgr
-trace       unix       -        -       n       -        0        bounce
-verify      unix       -        -       n       -        1        verify
-virtual     unix       -        n       n       -        -        virtual
-postlog     unix-dgram n        -       n       -        1        postlogd
-
-submission  inet       n        -       n       -        -        smtpd -o syslog_name=postfix/submission
-  -o smtpd_tls_security_level=encrypt
-  -o content_filter=dksign:[127.0.0.1]:10027
-
-dksign      unix       -        -       n       -        -        smtp
-  -o syslog_name=postfix/dkimproxyout-listen
-  -o smtp_send_xforward_command=yes
-  -o smtp_discard_ehlo_keywords=8bitmime,starttls
-
-127.0.0.1:10028 inet   n        -       n       -        -        smtpd
-  -o syslog_name=postfix/dkimproxyout-relay
-  -o content_filter=
-  -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-  -o smtpd_helo_restrictions=
-  -o smtpd_client_restrictions=
-  -o smtpd_sender_restrictions=
-  -o smtpd_recipient_restrictions=permit_mynetworks,reject
-  -o mynetworks=127.0.0.0/8
-  -o smtpd_authorized_xforward_hosts=127.0.0.0/8
diff --git a/tests/internet/etc/sasl2/smtpd.conf b/tests/internet/etc/sasl2/smtpd.conf
deleted file mode 100644
index af2ac43..0000000
--- a/tests/internet/etc/sasl2/smtpd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-pwcheck_method: saslauthd
-saslauthd_path: /var/run/saslauthd/mux
-log_level: 7
diff --git a/tests/internet/key.txt b/tests/internet/key.txt
deleted file mode 100644
index a39f765..0000000
--- a/tests/internet/key.txt
+++ /dev/null
@@ -1 +0,0 @@
-key-contents
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:<papod-configuration>
-                        (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)))
diff --git a/tests/internet/tests.scm b/tests/internet/tests.scm
deleted file mode 100644
index c4ffe85..0000000
--- a/tests/internet/tests.scm
+++ /dev/null
@@ -1,72 +0,0 @@
-(use-modules
-  ((org euandre packages) #:prefix pkg:)
-  (gnu)
-  (gnu tests)
-  (gnu system vm)
-  (guix profiles))
-(use-service-modules
-  networking)
-
-
-
-(define test-git-os
-  (simple-operating-system
-    (service dhcpcd-service-type)
-    (service pkg:git-service-type
-      (pkg:git-configuration
-        (run-server? #t)))
-    (simple-service 'mkdir-srv-dir activation-service-type
-      #~(mkdir-p "/srv/git"))))
-
-(define (test-git-fn)
-  (let* ((os (marionette-operating-system
-              test-git-os
-              #:imported-modules
-              '((gnu services herd))))
-         (vm (virtual-machine
-               (operating-system os)
-               (port-forwardings
-                '()))))
-    (define test
-      (with-imported-modules '((gnu build marionette))
-        #~(begin
-            (use-modules
-              ((srfi srfi-64) #:prefix t:)
-              ((gnu build marionette) #:prefix mrntt:))
-            (define manette
-              (mrntt:make-marionette (list #$vm)))
-            (t:test-runner-current (mrntt:system-test-runner #$output))
-            (t:test-begin "git-daemon-server")
-            (t:test-assert "Git daemon service running"
-              (mrntt:marionette-eval
-               '(begin
-                  (use-modules
-                    ((gnu services herd) #:prefix herd:))
-                  (herd:start-service 'git))
-               manette))
-            (t:test-assert "Git daemon TCP port ready"
-              (mrntt:wait-for-tcp-port 9418 manette))
-            (t:test-end))))
-    (gexp->derivation "git-service-type-test" test)))
-
-(define test-git
-  (system-test
-    (name "git")
-    (description "Test custom Git service")
-    (value (test-git-fn))))
-
-(define tests
-  (list
-   test-git))
-
-(define (system-test->manifest-entry test)
-  (manifest-entry
-    (name
-      (pkg:str "test."
-               (system-test-name test)))
-    (version "0")
-    (item test)))
-
-(manifest
- (map system-test->manifest-entry
-      tests))