Compare commits

..

No commits in common. "4e5a5a06ed57c6d23ed03e948e64d4aacecebb58" and "4405a390ccb86d1386367e5b815ccd960dced217" have entirely different histories.

2 changed files with 12 additions and 17 deletions

@ -70,7 +70,8 @@
(define-configuration sssd-configuration
(sssd (file-like sssd) "sssd package to use")
(pam-services (list-of-strings (list "su" "sddm" "login" "sshd" "passwd"))
(pam-services (list-of-strings (list "su" "sddm" "login" "sshd"
"passwd"))
"list of pam services to configure login for"
(lambda (a b)
""))
@ -138,11 +139,8 @@
(user (getpw "root")))
(mkdir-p/perms dbusdir user 493)
(mkdir-p/perms dbdir user 493)
(unless (file-exists? "/var/lib/sss/sssd.conf")
(begin
(copy-file #$(sssd-configuration-file config)
"/var/lib/sss/sssd.conf")
(chmod "/var/lib/sss/sssd.conf" #o600))))))
(copy-file #$(sssd-configuration-file config) "/var/lib/sss/sssd.conf")
(chmod "/var/lib/sss/sssd.conf" #o600))))
(define-public sssd-service-type
(service-type (name 'sssd)

@ -234,18 +234,16 @@
(sssd-configuration (domains (list (cons "metznet.ca"
(sssd-domain-configuration (id_provider
"ldap")
(debug_level
"10")
(debug_level "10")
(auth_provider
"ldap")
(cache_credentials
#t)
(ldap_schema
"rfc2307bis")
(ldap_schema "rfc2307bis")
(ldap_group_member
"member")
"member")
(ldap_group_object_class
"posixGroupAux")
"posixGroupAux")
(ldap_uri
"ldaps://ldap.metznet.ca")
(ldap_tls_reqcert
@ -313,7 +311,6 @@
"LDAP_AUTHTOK")
"")
"dc=metznet,dc=ca"
(list-ref
(command-line)
@ -353,14 +350,14 @@
%nscd-default-caches))))
(define %metznet-desktop-services
(append %metznet-services
(list (service sddm-service-type
(sddm-configuration)))
(append %metznet-services (list (service sddm-service-type (sddm-configuration)))
(modify-services %desktop-services
(delete gdm-service-type)
(nscd-service-type config => %metznet-nscd-configuration)
(network-manager-service-type config =>
(network-manager-configuration (vpn-plugins
(network-manager-configuration (inherit
config)
(vpn-plugins
(list
network-manager-openvpn)))))))