From da0a8522131628ce850d552120c376aed00d4666 Mon Sep 17 00:00:00 2001 From: Jean-Francois GUILLAUME Date: Mon, 16 May 2022 16:55:31 +0000 Subject: [PATCH 1/3] adding new cgroups --- glicid/services/parallel.scm | 1 + glicid/system/file-systems.scm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 glicid/system/file-systems.scm diff --git a/glicid/services/parallel.scm b/glicid/services/parallel.scm index f4959ba..518f8ec 100644 --- a/glicid/services/parallel.scm +++ b/glicid/services/parallel.scm @@ -5,6 +5,7 @@ #:use-module (guix records) #:use-module (ice-9 match) #:use-module (gnu packages parallel) + #:use-module (glicid system file-systems) #:export ( munged-configuration munged-configuration? diff --git a/glicid/system/file-systems.scm b/glicid/system/file-systems.scm new file mode 100644 index 0000000..abb4179 --- /dev/null +++ b/glicid/system/file-systems.scm @@ -0,0 +1,32 @@ +(define-module (glicid system file-systems) + #:use-module (gnu system file-systems) + #:export (%control-groups) +) + +(define %control-groups + (let + ((parent (file-system + (device "cgroup") + (mount-point "/sys/fs/cgroup") + (type "tmpfs") + (check? #f) + ))) + (cons parent + (map (lambda (subsystem) + (file-system + (device "cgroup") + (mount-point (string-append "/sys/fs/cgroup/" subsystem)) + (type "cgroup") + (check? #f) + (options subsystem) + (create-mount-point? #t) + (dependencies (list parent)) + ) + ) + '("blkio" "cpu" "cpuacct" "cpuset" "devices" "freezer" "hugetlb" + "memory" "net_cls" "net_prio" "perf_event" "pids" "rdma" "unified") + ) + ) + ) +) + From 5cbe8501d202b7d3b806ac8b168d0752b1b52345 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Fri, 30 Sep 2022 18:16:44 +0200 Subject: [PATCH 2/3] adding new versions of openldap --- glicid/packages/openldap.scm | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index 203dd72..eaead76 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -25,13 +25,13 @@ (define-public openldap (package (name "openldap") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") )) - (sha256 (base32 "11ygl4iilhkz5rhndh68lss4a33cqp9arb7mxj329dif4d2r7l41")) + (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")) ) ) (build-system gnu-build-system) @@ -255,6 +255,22 @@ ) ) +(define-public openldap-2.5.13 + (package + (inherit openldap) + (name "openldap") + (version "2.5.13") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") + )) + (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f")) + ) + ) + ) +) + (define-public openldap-2.6.0 (package (inherit openldap) @@ -287,6 +303,22 @@ ) ) +(define-public openldap-2.6.2 + (package + (inherit openldap) + (name "openldap") + (version "2.6.2") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz") + )) + (sha256 (base32 "11ygl4iilhkz5rhndh68lss4a33cqp9arb7mxj329dif4d2r7l41")) + ) + ) + ) +) + (define-public nss-pam-ldapd (package (name "nss-pam-ldapd") From beb39dddb30288154d785cfcd544ee11962b2635 Mon Sep 17 00:00:00 2001 From: Jean-Francois GUILLAUME Date: Wed, 23 Nov 2022 16:13:38 +0000 Subject: [PATCH 3/3] Devel --- glicid/services/authentication.scm | 91 ++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 glicid/services/authentication.scm diff --git a/glicid/services/authentication.scm b/glicid/services/authentication.scm new file mode 100644 index 0000000..23baa3f --- /dev/null +++ b/glicid/services/authentication.scm @@ -0,0 +1,91 @@ +(define-module (glicid services authentication) + #:use-module (gnu services) + #:use-module (gnu services shepherd) + #:use-module (guix) + #:use-module (guix records) + #:use-module (ice-9 match) + #:use-module (gnu packages sssd) + #:use-module (glicid system file-systems) + #:export ( + sssd-configuration + sssd-configuration? + sssd-service + sssd-service-type + ) +) + +(define-record-type* + sssd-configuration make-sssd-configuration sssd-configuration? + (sssd-pkg sssd-pkg + (default sssd) + ) + (sssd-conf sssd-conf + (default (file-append sssd-pkg "/lib/sssd/conf/sssd.conf")) + ) + (sssd-logger sssd-logger + (default "stderr") + ) + (sssd-debug-level sssd-debug-level + (default "") + ) + (log-file log-file + (default "/var/log/sssd/sssd.log") + ) +) + +(define sssd-service + (match-lambda + (($ sssd-pkg sssd-conf sssd-logger sssd-debug-level log-file) + (list + (shepherd-service + (provision '(sssd) ) + (documentation "Run sssd.") + (requirement '( + user-processes + )) + (respawn? #t) + (start #~(make-forkexec-constructor + (list + #$(file-append sssd-pkg "/sbin/sssd") + "--interactive" + (list (string-append "--config=" sssd-conf)) + (list(string-append "--logger=" sssd-logger)) + #$@(if sssd-debug-level + (list (string-append "--debug-level=" sssd-debug-level)) + '() + ) + ) + #:log-file #$log-file + )) + (stop #~(make-kill-destructor)) + ) + ) + ) + ) +) + +(define %sssd-activation + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (define (touch file-name) + (call-with-output-file file-name (const #t)) + ) + (mkdir-p "/var/log/sssd") + (mkdir-p "/var/lib/sssd") + #t + ) + ) +) + +(define sssd-service-type + (service-type (name 'sssd) + (extensions + (list + (service-extension shepherd-root-service-type sssd-service) + (service-extension activation-service-type (const %sssd-activation)) + ) + ) + (description "Run sssd") + ) +)