From bc52bc93696e2d2f1e82d1b8ca5bc997493d87cb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 12 Apr 2023 16:11:22 +0100 Subject: Run tissue on an IP socket. tissue fails to clean up its Unix socket when deployed with shepherd. So, when tissue crashes, it fails to restart. Until this issue is resolved, run tissue on an IP socket. * genenetwork-development.scm (%tissue-port): New variable. (tissue-reverse-proxy-server-block): Forward tissue requests to IP socket. (operating-system)[services]: Run tissue on an IP socket. --- genenetwork-development.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/genenetwork-development.scm b/genenetwork-development.scm index 7b01ce3..6285bbc 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -898,6 +898,9 @@ channel names for which a channels.scm should be published." (channels-scm-gexp published-channel-names)) ";")))))))) +;; Port on which tissue is listening +(define %tissue-port 9083) + (define (tissue-reverse-proxy-server-block listen) "Return an object listening on LISTEN to reverse proxy tissue." @@ -909,7 +912,7 @@ reverse proxy tissue." (locations (list (nginx-location-configuration (uri "@tissue-search") - (body (list "proxy_pass http://unix:/var/run/tissue/socket:;" + (body (list (string-append "proxy_pass http://localhost:" (number->string %tissue-port) ";") "proxy_set_header Host $host;"))))))) ;; Port on which webhook is listening @@ -1004,6 +1007,9 @@ reverse proxy tissue." (service tissue-service-type (tissue-configuration (package tissue) + (socket + (forge-ip-socket + (port %tissue-port))) (hosts (list (tissue-host (name "issues.genenetwork.org") -- cgit v1.2.3