aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2023-04-12 16:11:22 +0100
committerArun Isaac2023-04-12 16:11:22 +0100
commitbc52bc93696e2d2f1e82d1b8ca5bc997493d87cb (patch)
tree99428e131fe0b15e359972daca031eed538bb31f
parent91a3433f72321bb093bf773a1558578a8a160e39 (diff)
downloadgn-machines-bc52bc93696e2d2f1e82d1b8ca5bc997493d87cb.tar.gz
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.
-rw-r--r--genenetwork-development.scm8
1 files changed, 7 insertions, 1 deletions
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 <nginx-server-configuration> 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")