From 27b11fa7e4b5f28ab53be387ba0b69152922fe44 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 12 Aug 2021 21:21:15 +0200 Subject: Service: use the sysadmin locale --- guix/vkraus/services/disfluid.scm | 97 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 51 deletions(-) (limited to 'guix') diff --git a/guix/vkraus/services/disfluid.scm b/guix/vkraus/services/disfluid.scm index fdc9443..21adca2 100644 --- a/guix/vkraus/services/disfluid.scm +++ b/guix/vkraus/services/disfluid.scm @@ -211,25 +211,24 @@ (list (string-append #$disfluid "/bin/disfluid") "identity-provider" - "--complete-corresponding-source" #$ccs - "--server-name" #$issuer - "--key-file" #$key-file - "--subject" #$subject - "--encrypted-password-from-file" #$encrypted-password-file - "--jwks-uri" #$jwks-uri - "--authorization-endpoint-uri" #$authorization-endpoint-uri - "--token-endpoint-uri" #$token-endpoint-uri - "--port" (with-output-to-string (lambda () (display #$port))) - "--log-file" #$(format #f "issuer-~a.log" id) - "--error-file" #$(format #f "issuer-~a.err" id) + "-S" #$ccs + "-n" #$issuer + "-k" #$key-file + "-s" #$subject + "-W" #$encrypted-password-file + "-j" #$jwks-uri + "-a" #$authorization-endpoint-uri + "-t" #$token-endpoint-uri + "-p" (with-output-to-string (lambda () (display #$port))) + "-l" #$(format #f "issuer-~a.log" id) + "-e" #$(format #f "issuer-~a.err" id) #$@extra-options) #:user "disfluid" #:group "disfluid" #:directory "/var/log/disfluid" #:environment-variables '(#$(format #f "XDG_DATA_HOME=/var/lib/disfluid/~a" id) - #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id) - "LANG=C"))))) + #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id)))))) (stop #~(make-kill-destructor))))) ((id . ($ disfluid ccs port inbound-uri outbound-uri header extra-options)) @@ -258,21 +257,20 @@ (list (string-append #$disfluid "/bin/disfluid") "reverse-proxy" - "--complete-corresponding-source" #$ccs - "--port" (with-output-to-string (lambda () (display #$port))) - "--server-name" #$inbound-uri - "--backend-uri" #$outbound-uri - "--header" #$header - "--log-file" #$(format #f "reverse-proxy-~a.log" id) - "--error-file" #$(format #f "reverse-proxy-~a.err" id) + "-S" #$ccs + "-p" (with-output-to-string (lambda () (display #$port))) + "-n" #$inbound-uri + "-b" #$outbound-uri + "-H" #$header + "-l" #$(format #f "reverse-proxy-~a.log" id) + "-e" #$(format #f "reverse-proxy-~a.err" id) #$@extra-options) #:user "disfluid" #:group "disfluid" #:directory "/var/log/disfluid" #:environment-variables '(#$(format #f "XDG_DATA_HOME=/var/lib/disfluid/~a" id) - #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id) - "LANG=C"))))) + #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id)))))) (stop #~(make-kill-destructor))))) ((id . ($ disfluid ccs port extra-options)) @@ -300,18 +298,17 @@ (make-forkexec-constructor (list (string-append #$disfluid "/bin/disfluid-hello") - "--complete-corresponding-source" #$ccs - "--port" (with-output-to-string (lambda () (display #$port))) - "--log-file" #$(format #f "hello-~a.log" id) - "--error-file" #$(format #f "hello-~a.err" id) + "-S" #$ccs + "-p" (with-output-to-string (lambda () (display #$port))) + "-l" #$(format #f "hello-~a.log" id) + "-e" #$(format #f "hello-~a.err" id) #$@extra-options) #:user "disfluid" #:group "disfluid" #:directory "/var/log/disfluid" #:environment-variables '(#$(format #f "XDG_DATA_HOME=/var/lib/disfluid/~a" id) - #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id) - "LANG=C"))))) + #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id)))))) (stop #~(make-kill-destructor))))) ((id . ($ disfluid ccs client-id redirect-uri client-name client-uri port @@ -341,22 +338,21 @@ (list (string-append #$disfluid "/bin/disfluid") "client-service" - "--complete-corresponding-source" #$ccs - "--client-id" #$client-id - "--redirect-uri" #$redirect-uri - "--client-name" #$client-name - "--client-uri" #$client-uri - "--port" (with-output-to-string (lambda () (display #$port))) - "--log-file" #$(format #f "client-service-~a.log" id) - "--error-file" #$(format #f "client-service-~a.err" id) + "-S" #$ccs + "-c" #$client-id + "-r" #$redirect-uri + "-C" #$client-name + "-u" #$client-uri + "-p" (with-output-to-string (lambda () (display #$port))) + "-l" #$(format #f "client-service-~a.log" id) + "-e" #$(format #f "client-service-~a.err" id) #$@extra-options) #:user "disfluid" #:group "disfluid" #:directory "/var/log/disfluid" #:environment-variables '(#$(format #f "XDG_DATA_HOME=/var/lib/disfluid/~a" id) - #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id) - "LANG=C"))))) + #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id)))))) (stop #~(make-kill-destructor))))) ((id . ($ disfluid ccs server-name key-file subject encrypted-password-file jwks-uri @@ -387,25 +383,24 @@ (list (string-append #$disfluid "/bin/disfluid") "server" - "--complete-corresponding-source" #$ccs - "--server-name" #$server-name - "--key-file" #$key-file - "--subject" #$subject - "--encrypted-password-from-file" #$encrypted-password-file - "--jwks-uri" #$jwks-uri - "--authorization-endpoint-uri" #$authorization-endpoint-uri - "--token-endpoint-uri" #$token-endpoint-uri - "--port" (with-output-to-string (lambda () (display #$port))) - "--log-file" #$(format #f "server-~a.log" id) - "--error-file" #$(format #f "server-~a.err" id) + "-S" #$ccs + "-n" #$server-name + "-k" #$key-file + "-s" #$subject + "-W" #$encrypted-password-file + "-j" #$jwks-uri + "-a" #$authorization-endpoint-uri + "-t" #$token-endpoint-uri + "-p" (with-output-to-string (lambda () (display #$port))) + "-l" #$(format #f "server-~a.log" id) + "-e" #$(format #f "server-~a.err" id) #$@extra-options) #:user "disfluid" #:group "disfluid" #:directory "/var/log/disfluid" #:environment-variables '(#$(format #f "XDG_DATA_HOME=/var/lib/disfluid/~a" id) - #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id) - "LANG=C"))))) + #$(format #f "XDG_CACHE_HOME=/var/cache/disfluid/~a" id)))))) (stop #~(make-kill-destructor))))) ((items ...) (apply append (map configuration->shepherd-service items))))) -- cgit v1.2.3