From 7394fa81277bedf4fff80f9de6ac6580d6922548 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Wed, 30 Nov 2022 16:59:35 +0100
Subject: [PATCH] removing sssd package and changing services definitions

---
 glicid/packages/sssd.scm           | 23 -----------------------
 glicid/services/authentication.scm | 20 ++++++++++----------
 glicid/services/openldap.scm       | 14 +++++++-------
 3 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 glicid/packages/sssd.scm

diff --git a/glicid/packages/sssd.scm b/glicid/packages/sssd.scm
deleted file mode 100644
index 1ed0c25..0000000
--- a/glicid/packages/sssd.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-(define-module (glicid packages sssd)
-               #:use-module (guix packages)
-               #:use-module (guix download)
-               #:use-module (guix git-download)
-               #:use-module (gnu packages dns)
-               #:use-module ((gnu packages sssd) #:prefix gnu:) 
-               )
-
-(define-public sssd
-               (package
-                 (inherit gnu:sssd)
-                 (name "sssd")
-                 (version "2.8.1")
-                 (source 
-                   (origin
-                     (method url-fetch)
-                     (uri (string-append "https://github.com/SSSD/sssd/releases/download/2.8.1/sssd-" version ".tar.gz"))
-                     (sha256 (base32 "121i1xh89r3bv59rndnrdlra3fvzam88g15gq0acpj1n6ib3ay0s"))))
-                 (inputs `( bind
-                            ,@(package-inputs gnu:sssd)
-                            ))))
-
-sssd
diff --git a/glicid/services/authentication.scm b/glicid/services/authentication.scm
index c2888e1..993e703 100644
--- a/glicid/services/authentication.scm
+++ b/glicid/services/authentication.scm
@@ -17,15 +17,15 @@
 (define-record-type* 
   <sssd-configuration>
   sssd-configuration make-sssd-configuration sssd-configuration?
-  (sssd-pkg sssd-pkg (default sssd))
-  (sssd-config-file sssd-config-file (default "/etc/sssd/sssd.conf"))
-  (sssd-logger sssd-logger (default "stderr"))
-  (sssd-debug-level sssd-debug-level (default "3"))
+  (pkg pkg (default sssd))
+  (config-file config-file (default "/etc/sssd/sssd.conf"))
+  (logger logger (default "stderr"))
+  (debug-level debug-level (default "3"))
   (log-file log-file (default "/var/log/sssd/sssd.log")))
 
 (define sssd-service
   (match-lambda
-    (($ <sssd-configuration> sssd-pkg sssd-config-file sssd-logger sssd-debug-level log-file)
+    (($ <sssd-configuration> pkg config-file logger debug-level log-file)
      (list
        (shepherd-service
          (provision '(sssd))
@@ -34,11 +34,11 @@
          (respawn? #t)
          (start #~(make-forkexec-constructor
                     (list
-                      #$(file-append sssd-pkg "/sbin/sssd")
+                      #$(file-append pkg "/sbin/sssd")
                       "-i"
-                      "-c" #$sssd-config-file
-                      "--logger" #$sssd-logger
-                      "-d" #$sssd-debug-level
+                      "-c" #$config-file
+                      "--logger" #$logger
+                      "-d" #$debug-level
                       )
                     #:log-file #$log-file
                     ))
@@ -51,7 +51,7 @@
       (mkdir-p "/var/lib/sss/db")
       (mkdir-p "/var/lib/sss/mc")
       (mkdir-p "/var/lib/sss/pipes/private")
-      (install-file #$(file-append sssd-pkg "/lib/sssd/conf/sssd.conf") "/etc/sssd/")
+      (install-file #$(file-append pkg "/lib/sssd/conf/sssd.conf") "/etc/sssd/")
       #t ))
 
 (define sssd-service-type
diff --git a/glicid/services/openldap.scm b/glicid/services/openldap.scm
index e6d526f..60abdf6 100644
--- a/glicid/services/openldap.scm
+++ b/glicid/services/openldap.scm
@@ -17,15 +17,15 @@
   openldap-configuration make-openldap-configuration
   openldap-configuration?
   (openldap-pkg openldap-pkg (default openldap))
-  (uri openldap-uri (default "ldapi:// ldap://"))
-  (logflags openldap-logflags (default "0"))
-  (pid-file openldap-pid-file (default "/var/run/openldap/slapd.pid"))
-  (config-file openldap--config-file (default (file-append openldap "/etc/openldap/slapd.conf")))
-  (log-file openldap-log-file (default "/var/log/slapd.log")))
+  (uri uri (default "ldapi:// ldap://"))
+  (logflags logflags (default "0"))
+  (pid-file pid-file (default "/var/run/openldap/slapd.pid"))
+  (config-file config-file (default (file-append openldap "/etc/openldap/slapd.conf")))
+  (log-file log-file (default "/var/log/slapd.log")))
 
 (define openldap-shepherd-service
   (match-lambda
-    (($ <openldap-configuration> openldap-pkg uri logflags pid-file config-file log-file)
+    (($ <openldap-configuration> pkg uri logflags pid-file config-file log-file)
      (list
        (shepherd-service
          (provision '(slapd))
@@ -34,7 +34,7 @@
          (respawn? #t)
          (start #~(make-forkexec-constructor
                     (list
-                      #$(file-append openldap "/libexec/slapd")
+                      #$(file-append pkg "/libexec/slapd")
                       "-h" #$uri
                       "-d" #$logflags
                       "-f" #$config-file