diff options
Diffstat (limited to 'vm.scm')
| -rw-r--r-- | vm.scm | 41 |
1 files changed, 3 insertions, 38 deletions
@@ -23,10 +23,6 @@ service-type simple-service)) ((gnu services base) #:select (guix-service-type guix-extension %base-services)) - ((gnu services ldap) #:select - (backend-userroot-configuration - directory-server-instance-configuration - directory-server-service-type slapd-configuration)) ((gnu services mcron) #:prefix mc:) ((gnu services networking) #:select (dhcp-client-service-type)) ((gnu services shepherd) #:select @@ -50,9 +46,6 @@ (define %here (dirname (current-filename))) -(define 389-ds-base - (load (string-append %here "/good-dirsrv.scm"))) - (define %ctftilde-phases (with-imported-modules '((guix build guile-build-system)) #~(modify-phases %standard-phases @@ -127,21 +120,6 @@ Cantius, part of a CTF competition VM.") (prepend %services (service dhcp-client-service-type)) -(define ds-root-password-hash - (let* ((password (call-with-input-file "ds-389.password" get-string-all)) - (path (string-split (getenv "PATH") #\:)) - (has-pwdhash? (search-path path "pwdhash")) - (command (list "pwdhash" "-s" "SHA256" password)) - (command* (if has-pwdhash? - command - (cons* "guix" "shell" "389-ds-base" "--" command))) - (pipe (apply open-pipe* OPEN_READ command*)) - (hash (get-string-all pipe))) - (close-pipe pipe) - (string-trim-right hash #\newline))) - -(format #t "directory server root password hash: ~A~%" ds-root-password-hash) - (prepend %services (simple-service 'cert-access-ctftilde activation-service-type #~(let ((access-gid (group:gid (getgrnam "cert-ctftilde")))) @@ -153,20 +131,6 @@ Cantius, part of a CTF competition VM.") '(#o750 #o640 #o640))))) (prepend %services - (service directory-server-service-type - (directory-server-instance-configuration - (package 389-ds-base) - (full-machine-name "ctftilde.koszko.org") - (slapd (slapd-configuration - (instance-name "ctftilde") - (root-dn "cn=CTF Manager") - (root-password ds-root-password-hash) - (run-dir "/var/run/dirsrv"))) - (backend-userroot ((@@ (gnu services ldap) backend-userroot-configuration) - ;;(create-suffix-entry? #f) - (suffix "dc=ctftilde,dc=koszko,dc=org")))))) - -(prepend %services (simple-service 'gemini-main-server-directory activation-service-type #~(begin (false-if-exception (delete-file "/srv/gemini")) @@ -352,8 +316,9 @@ Cantius, part of a CTF competition VM.") "net-tools" "man-pages-posix" "emacs")) - (list ctftilde - 389-ds-base) + + (list ctftilde) + %base-packages)) (services %services)) |