MetzNet
/
metznet-channel
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed typo in openvpn and moved pam list for sssd to defaults

master
noah metz 2023-12-02 19:12:12 -07:00
parent 5d4ad5b464
commit ccc6c43d7a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/services/sssd.scm
Unescape Escape View File

@ -9,15 +9,6 @@
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:export (sssd-configuration sssd-service-type)) #:export (sssd-configuration sssd-service-type))
(define-configuration/no-serialization sssd-configuration
(sssd (file-like sssd)
"SSSD Package to use")
(pam-services (list-of-strings '())
"List of pam services to use sssd for")
(config (file-like
default-sssd-conf-file)
"sssd.conf file"))
(define default-sssd-conf-file (define default-sssd-conf-file
(plain-file "sssd.conf" (plain-file "sssd.conf"
(string-join (list "[sssd]" (string-join (list "[sssd]"
@ -39,6 +30,18 @@
(or (getenv "LDAP_BINDPW") "")) (or (getenv "LDAP_BINDPW") ""))
"") "\n"))) "") "\n")))
(define-configuration/no-serialization sssd-configuration
(sssd (file-like sssd)
"SSSD Package to use")
(pam-services (list-of-strings (list "su" "gdm-password"
"login" "sshd"
"passwd"))
"List of pam services to use sssd for")
(config (file-like
default-sssd-conf-file)
"sssd.conf file"))
(define (sssd-pam-service config) (define (sssd-pam-service config)
(define sssd-pam-module (define sssd-pam-module
(file-append (sssd-configuration-sssd config) "/lib/security/pam_sss.so")) (file-append (sssd-configuration-sssd config) "/lib/security/pam_sss.so"))

9
metznet/system/base-system.scm
Unescape Escape View File

@ -243,9 +243,9 @@
(define (metznet-etc-service configuration) (define (metznet-etc-service configuration)
`(("openvpn/ta.key" ,(metznet-system-configuration-vpn-ta-key configuration)) `(("openvpn/ta.key" ,(metznet-system-configuration-vpn-ta-key configuration))
("openvpn/ca.crt" ,(metznet-system-configuration-vpn-ca configuration)) ("openvpn/ca.crt" ,(metznet-system-configuration-vpn-ca configuration))
("openvpn/client.key" ,(metznet-system-configuration-vpn-cert ("openvpn/client.key" ,(metznet-system-configuration-vpn-key
configuration)) configuration))
("openvpn/client.crt" ,(metznet-system-configuration-vpn-key configuration)))) ("openvpn/client.crt" ,(metznet-system-configuration-vpn-cert configuration))))
(define-public metznet-service-type (define-public metznet-service-type
(service-type (name 'metznet-service) (service-type (name 'metznet-service)
@ -269,10 +269,7 @@
(service pam-krb5-service-type (service pam-krb5-service-type
(pam-krb5-configuration (pam-krb5 pam-krb5) (pam-krb5-configuration (pam-krb5 pam-krb5)
(minimum-uid 1000))) (minimum-uid 1000)))
(service sssd-service-type (service sssd-service-type)
(sssd-configuration (pam-services (list "su" "gdm-password"
"login" "sshd"
"passwd"))))
(service metznet-service-type))) (service metznet-service-type)))
(define %metznet-nscd-configuration (define %metznet-nscd-configuration