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

Compare commits

base: MetzNet:4e5a5a06ed57c6d23ed03e948e64d4aacecebb58
Branches Tags
MetzNet:master
..
compare: MetzNet:4405a390ccb86d1386367e5b815ccd960dced217
Branches Tags
MetzNet:master

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

2 changed files with 12 additions and 17 deletions
Show Stats Expand all files Collapse all files

10
metznet/services/sssd.scm
Unescape Escape View File

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

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

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