diff options
Diffstat (limited to 'vkraus/systems')
-rw-r--r-- | vkraus/systems/test.scm | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/vkraus/systems/test.scm b/vkraus/systems/test.scm index bb8e7f1..c742db9 100644 --- a/vkraus/systems/test.scm +++ b/vkraus/systems/test.scm @@ -44,60 +44,60 @@ ((#:user username args ...) (let ((added-args `(#:complete-corresponding-source "https://disfluid.planete-kraus.eu/complete-corresponding-source.tar.gz" - #:server-name (format #f "http://localhost:~a" port) - #:subject (format #f "http://localhost:~a/~a#me" port username) + #:server-name ,(format #f "http://localhost:~a" port) + #:subject ,(format #f "http://localhost:~a/~a#me" port username) #:encrypted-password-file - (computed-file (format #f "~a-password" username) - #~(let ((salt "$6$not.secured.salt.") - (password username)) - (call-with-output-file #$output - (lambda (port) - (format port "~a\n" - (crypt password salt)))))) - #:key-file (format #f "/var/lib/disfluid/~a/key.jwk" username) - #:jwks-uri (format #f "http://localhost:~a/keys" port) + ,(computed-file (format #f "~a-password" username) + #~(let ((salt "$6$not.secured.salt.") + (password username)) + (call-with-output-file #$output + (lambda (port) + (format port "~a\n" + (crypt password salt)))))) + #:key-file ,(format #f "/var/lib/disfluid/~a/key.jwk" username) + #:jwks-uri ,(format #f "http://localhost:~a/keys" port) #:authorization-endpoint-uri - (format #f "http://localhost:~a/authorize" port) + ,(format #f "http://localhost:~a/authorize" port) #:token-endpoint-uri - (format #f "http://localhost:~a/token" port)))) + ,(format #f "http://localhost:~a/token" port)))) (replace-#:user args (append (reverse added-args) replaced) #t))) (((? keyword? key) value args ...) (replace-#:user args `(,value ,key ,@replaced) replaced?)))))) (operating-system - (host-name "disfluid-test-system") - (hosts-file - (plain-file "hosts" - "127.0.0.1 localhost + (host-name "disfluid-test-system") + (hosts-file + (plain-file "hosts" + "127.0.0.1 localhost ::1 localhost ")) - (users %base-user-accounts) - (packages - `(,disfluid - ,nss-certs - ,@%base-packages)) - (services - (append - (list - (service disfluid-service-type - `(("alice" - . ,(make <test-server-configuration> - #:user "alice" - #:port 8081)) - ("bob" - . ,(make <test-server-configuration> - #:user "bob" - #:port 8082))))) - %base-services)) - (timezone "Europe/Paris") - (bootloader - (bootloader-configuration - (bootloader grub-efi-bootloader) - (target "/boot/efi"))) - (mapped-devices '()) - (file-systems - `(,(file-system - (mount-point "/") - (device "/dev/sda") - (type "ext4")) - ,@%base-file-systems))) + (users %base-user-accounts) + (packages + `(,disfluid + ,nss-certs + ,@%base-packages)) + (services + (append + (list + (service disfluid-service-type + `(("alice" + . ,(make <test-server-configuration> + #:user "alice" + #:port 8081)) + ("bob" + . ,(make <test-server-configuration> + #:user "bob" + #:port 8082))))) + %base-services)) + (timezone "Europe/Paris") + (bootloader + (bootloader-configuration + (bootloader grub-efi-bootloader) + (target "/boot/efi"))) + (mapped-devices '()) + (file-systems + `(,(file-system + (mount-point "/") + (device "/dev/sda") + (type "ext4")) + ,@%base-file-systems))) |