ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: hurd: Add PAM support with shadow and sudo.

Browse source 
* gnu/system.scm (hurd-default-essential-services): Add
setuid-program-service-type.
* gnu/system/hurd.scm (%base-packages/hurd): Add shadow, sudo.
(%setuid-programs/hurd): New variable.
(%hurd-default-operating-system)[setuid-program]: Use it.
[pam-services, sudoers-file]: Remove overrides; enabling regular defaults.
* gnu/system/examples/bare-hurd.tmpl (%hurd-os)[users]: New field.
[services]: Do not disable PAM in SSH.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-10-09 22:55:46 +02:00
parent f08587682a
commit 16f8ea064c
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/system.scm
View file

@ -634,6 +634,8 @@ (define (hurd-default-essential-services os)
(operating-system-file-systems os))) (operating-system-file-systems os)))
(pam-root-service (operating-system-pam-services os)) (pam-root-service (operating-system-pam-services os))
(operating-system-etc-service os) (operating-system-etc-service os)
(service setuid-program-service-type
(operating-system-setuid-programs os))
(service profile-service-type (operating-system-packages os))))) (service profile-service-type (operating-system-packages os)))))
(define* (operating-system-services os) (define* (operating-system-services os)

9
gnu/system/examples/bare-hurd.tmpl
View file

@ -40,15 +40,20 @@
%base-file-systems)) %base-file-systems))
(host-name "guixygnu") (host-name "guixygnu")
(timezone "Europe/Amsterdam") (timezone "Europe/Amsterdam")
(users (cons (user-account
(name "guix")
(comment "Anonymous Hurd Hacker")
(group "users")
(supplementary-groups '("wheel")))
%base-user-accounts))
(packages (cons openssh-sans-x %base-packages/hurd)) (packages (cons openssh-sans-x %base-packages/hurd))
(services (cons (service openssh-service-type (services (cons (service openssh-service-type
(openssh-configuration (openssh-configuration
(openssh openssh-sans-x) (openssh openssh-sans-x)
(use-pam? #f)
(port-number 2222) (port-number 2222)
(permit-root-login #t) (permit-root-login #t)
(allow-empty-passwords? #t) (allow-empty-passwords? #t)
(password-authentication? #t))) (password-authentication? #t)))
%base-services/hurd)))) %base-services/hurd))))
%hurd-os %hurd-os

20
gnu/system/hurd.scm
View file

@ -42,7 +42,8 @@ (define-module (gnu system hurd)
#:export (%base-packages/hurd #:export (%base-packages/hurd
%base-services/hurd %base-services/hurd
%hurd-default-operating-system %hurd-default-operating-system
%hurd-default-operating-system-kernel)) %hurd-default-operating-system-kernel
%setuid-programs/hurd))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -62,7 +63,7 @@ (define %hurd-default-operating-system-kernel
(define %base-packages/hurd (define %base-packages/hurd
(list hurd bash coreutils file findutils grep sed (list hurd bash coreutils file findutils grep sed
guile-3.0 guile-colorized guile-readline guile-3.0 guile-colorized guile-readline
net-base inetutils less shepherd which)) net-base inetutils less shadow shepherd sudo which))
(define %base-services/hurd (define %base-services/hurd
(list (service hurd-console-service-type (list (service hurd-console-service-type
@ -86,6 +87,17 @@ (define %base-services/hurd
`(("/bin/sh" ,(file-append bash "/bin/sh")) `(("/bin/sh" ,(file-append bash "/bin/sh"))
("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) ("/usr/bin/env" ,(file-append coreutils "/bin/env"))))))
(define %setuid-programs/hurd
;; Default set of setuid-root programs.
(list (file-append shadow "/bin/passwd")
(file-append shadow "/bin/sg")
(file-append shadow "/bin/su")
(file-append shadow "/bin/newgrp")
(file-append shadow "/bin/newuidmap")
(file-append shadow "/bin/newgidmap")
(file-append sudo "/bin/sudo")
(file-append sudo "/bin/sudoedit")))
(define %hurd-default-operating-system (define %hurd-default-operating-system
(operating-system (operating-system
(kernel %hurd-default-operating-system-kernel) (kernel %hurd-default-operating-system-kernel)
@ -103,6 +115,4 @@ (define %hurd-default-operating-system
(timezone "GNUrope") (timezone "GNUrope")
(name-service-switch #f) (name-service-switch #f)
(essential-services (hurd-default-essential-services this-operating-system)) (essential-services (hurd-default-essential-services this-operating-system))
(pam-services '()) (setuid-programs %setuid-programs/hurd)))
(setuid-programs '())
(sudoers-file #f)))