From fb1a259b1e998138654e5d18884d7af880ce07d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20GUILLAUME?= Date: Thu, 4 Nov 2021 22:02:40 +0100 Subject: [PATCH] formating --- glicid/packages/nginx.scm | 17 +++--- glicid/packages/openldap.scm | 43 ++++++++++----- glicid/services/openldap.scm | 102 +++++++++++++++++------------------ 3 files changed, 88 insertions(+), 74 deletions(-) diff --git a/glicid/packages/nginx.scm b/glicid/packages/nginx.scm index d5e1de1..db2f844 100644 --- a/glicid/packages/nginx.scm +++ b/glicid/packages/nginx.scm @@ -26,9 +26,9 @@ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/kvspb/nginx-auth-ldap") - (commit version) - ) + (url "https://github.com/kvspb/nginx-auth-ldap") + (commit version) + ) ) (file-name (git-file-name "nginx-ldap-auth-module" version)) (sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s" )) @@ -86,9 +86,8 @@ (origin (method url-fetch) (uri (list - (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") - ) - ) + (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") + )) (sha256 (base32 "1sarp7bjvkkdlpky5j9axfi0qmb177vw2vn2s10c8fcdg9dgj6vm" )) ) ) @@ -128,9 +127,8 @@ (origin (method url-fetch) (uri (list - (string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") - ) - ) + (string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") + )) (sha256 (base32 "0clcny8276d3j73ws661lh983vqq9m29rw7qb7gn132ha066d9j1" )) ) ) @@ -177,4 +175,3 @@ ) ) ) -nginx-modsecurity-module diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index 926cbaa..bc89f38 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -35,24 +35,41 @@ ) (build-system gnu-build-system) (inputs `( - ("libltdl", libltdl) - ("pkg-config", pkg-config) - ("libevent", libevent) - ("openssl", openssl) - ("argon2", argon2) - ("wiredtiger", wiredtiger) - ("snappy", snappy) - ("lz4", lz4) - ,@(package-inputs gnu:openldap) + ("libltdl", libltdl) + ("pkg-config", pkg-config) + ("libevent", libevent) + ("openssl", openssl) + ("argon2", argon2) + ("wiredtiger", wiredtiger) + ("snappy", snappy) + ("lz4", lz4) + ,@(package-inputs gnu:openldap) )) (arguments '( ; this is needed because the make check does not work inside guix #:tests? #f #:configure-flags '( - "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl" - "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi" - "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static" - "--enable-shared" "--with-tls=openssl" + "--enable-debug" + "--enable-dynamic" + "--enable-syslog" + "--enable-ipv6" + "--enable-local" + "--enable-slapd" + "--enable-dynacl" + "--enable-aci" + "--enable-cleartext" + "--enable-crypt" + "--enable-spasswd" + "--enable-modules" + "--enable-rlookups" + "--enable-slapi" + "--enable-backends=mod" + "--enable-overlays=mod" + "--enable-argon2" + "--enable-balancer" + "--disable-static" + "--enable-shared" + "--with-tls=openssl" ) #:make-flags '("STRIP=") #:phases (modify-phases %standard-phases diff --git a/glicid/services/openldap.scm b/glicid/services/openldap.scm index b0d50a7..63dc463 100644 --- a/glicid/services/openldap.scm +++ b/glicid/services/openldap.scm @@ -13,68 +13,68 @@ ) (define-record-type* - openldap-configuration make-openldap-configuration - openldap-configuration? - (openldap openldap-configuration-openldap ; - (default openldap-glicid) - ) - (arguments openldap-configuration-arguments ;list of strings - (default '()) - ) - (logflags openldap-configuration-logflags ;number - (default "0") - ) - (log-file openldap-configuration-log-file ; string - (default "/var/log/slapd.log") - ) - (pid-file openldap-configuration-pid-file ; string - (default "/var/run/openldap/slapd.pid") - ) - (config-file openldap-configuration-config-file ; string - (default %default-slapd.conf) - ) - (schema-dir openldap-configuration-schema-dir ; string - (default '()) - ) + openldap-configuration make-openldap-configuration + openldap-configuration? + (openldap openldap-configuration-openldap ; + (default openldap-glicid) + ) + (arguments openldap-configuration-arguments ;list of strings + (default '()) + ) + (logflags openldap-configuration-logflags ;number + (default "0") + ) + (log-file openldap-configuration-log-file ; string + (default "/var/log/slapd.log") + ) + (pid-file openldap-configuration-pid-file ; string + (default "/var/run/openldap/slapd.pid") + ) + (config-file openldap-configuration-config-file ; string + (default %default-slapd.conf) + ) + (schema-dir openldap-configuration-schema-dir ; string + (default '()) + ) ) (define %default-slapd.conf (plain-file "slapd.conf" " - # Empty file for test + # Empty file for test ")) (define schema_dir (local-file "ldap_schema" #:recursive? #t)) (define openldap-shepherd-service - (match-lambda - (($ openldap arguments logflags log-file pid-file config-file schema-dir) + (match-lambda + (($ openldap arguments logflags log-file pid-file config-file schema-dir) + (list + (shepherd-service + (provision '(slapd) ) + (documentation "Run openldap.") + (requirement '(user-processes)) + (respawn? #f) + (start #~(make-forkexec-constructor (list - (shepherd-service - (provision '(slapd) ) - (documentation "Run openldap.") - (requirement '(user-processes)) - (respawn? #f) - (start #~(make-forkexec-constructor - (list - #$(file-append openldap-glicid "/libexec/slapd") - "-h 'ldap:/// ldaps:///'" - "-d" #$logflags - "-f" #$config-file - ) - #:pid-file #$pid-file - )) - (stop #~(make-kill-destructor)) - ) + #$(file-append openldap-glicid "/libexec/slapd") + "-h 'ldap:/// ldaps:///'" + "-d" #$logflags + "-f" #$config-file ) + #:pid-file #$pid-file + )) + (stop #~(make-kill-destructor)) ) + ) ) + ) ) (define openldap-service-type - (service-type (name 'slapd) - (extensions - (list ( - service-extension - shepherd-root-service-type - openldap-shepherd-service - )) - ) - (description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.") + (service-type (name 'slapd) + (extensions + (list ( + service-extension + shepherd-root-service-type + openldap-shepherd-service + )) ) + (description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.") + ) )