diff options
author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-06-27 20:59:27 +0200 |
---|---|---|
committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-06-27 21:22:53 +0200 |
commit | 099ab0331750e2fde7c1cfbab9b262dd1c9edcf8 (patch) | |
tree | d2c84f4cf190773ff6ec16fb95b89af8bfc5fefc /guix/vkraus | |
parent | f58f4a40a427926e90d8761a9ee02a8c0dd58455 (diff) |
Make a unique program with all commands
Diffstat (limited to 'guix/vkraus')
-rw-r--r-- | guix/vkraus/packages/webid-oidc.scm | 6 | ||||
-rw-r--r-- | guix/vkraus/services/webid-oidc.scm | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/guix/vkraus/packages/webid-oidc.scm b/guix/vkraus/packages/webid-oidc.scm index b4d0aa2..8ada121 100644 --- a/guix/vkraus/packages/webid-oidc.scm +++ b/guix/vkraus/packages/webid-oidc.scm @@ -73,13 +73,17 @@ (format #f "~a/lib/guile/~a/site-ccache" prop-input effective-version)) guile-propagated-inputs)))) + (wrap-program + (format #f "~a/bin/webid-oidc" out) + `("GUILE_LOAD_PATH" ":" = ,mod-paths) + `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths)) (for-each (lambda (program) (wrap-program (format #f "~a/bin/webid-oidc-~a" out program) `("GUILE_LOAD_PATH" ":" = ,mod-paths) `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths))) - '(client-service example-app hello issuer reverse-proxy)))))))) + '(client-service example-app hello issuer)))))))) (native-inputs `(("pkg-config" ,pkg-config) ("guile" ,guile-3.0) diff --git a/guix/vkraus/services/webid-oidc.scm b/guix/vkraus/services/webid-oidc.scm index e510ba9..b648494 100644 --- a/guix/vkraus/services/webid-oidc.scm +++ b/guix/vkraus/services/webid-oidc.scm @@ -193,10 +193,11 @@ (prepare-directory "/var/cache/webid-oidc")) (make-forkexec-constructor (list - (string-append #$webid-oidc "/bin/webid-oidc-reverse-proxy") + (string-append #$webid-oidc "/bin/webid-oidc") + "reverse-proxy" "--port" (with-output-to-string (lambda () (display #$port))) - "--inbound-uri" #$inbound-uri - "--outbound-uri" #$outbound-uri + "--server-name" #$inbound-uri + "--backend-uri" #$outbound-uri "--header" #$header "--log-file" "reverse-proxy.log" "--error-file" "reverse-proxy.err" |