From 1454b86d292b284b61ff9044dfb4221719732a60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Oct 2022 18:28:28 +0300 Subject: Update pluto service --- pluto-channels.scm | 26 ++++++++++++++++++++++++++ run_pluto.sh | 2 -- shepherd/init.d/pluto.scm | 17 ++++++++--------- 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 pluto-channels.scm delete mode 100755 run_pluto.sh diff --git a/pluto-channels.scm b/pluto-channels.scm new file mode 100644 index 0000000..10257cf --- /dev/null +++ b/pluto-channels.scm @@ -0,0 +1,26 @@ +(list + (channel + (name 'gn-bioinformatics) + (url "https://gitlab.com/genenetwork/guix-bioinformatics") + (commit + "ac5eef9bfb431fac6fdfc60dd06ef44607787b76")) + (channel + (name 'guix-past) + (url "https://gitlab.inria.fr/guix-hpc/guix-past") + (commit + "247a14c67af91febfbd5b7f60be9f64945fba713") + (introduction + (make-channel-introduction + "0c119db2ea86a389769f4d2b9c6f5c41c027e336" + (openpgp-fingerprint + "3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5")))) + (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "79358a99cd46a27fdc716309ccee2596483ab9af") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) diff --git a/run_pluto.sh b/run_pluto.sh deleted file mode 100755 index a0f4cfe..0000000 --- a/run_pluto.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -$(/home/shepherd/guix-profiles/pluto/bin/guix system container -L /home/shepherd/guix-past/modules/ -L /home/shepherd/guix-bioinformatics/ /home/shepherd/guix-bioinformatics/gn/services/pluto.scm --network) diff --git a/shepherd/init.d/pluto.scm b/shepherd/init.d/pluto.scm index dc36730..81c7fe6 100644 --- a/shepherd/init.d/pluto.scm +++ b/shepherd/init.d/pluto.scm @@ -1,14 +1,13 @@ (define pluto (make - #:provides '(pluto) - #:docstring "Run a pluto web server" - #:start (make-forkexec-constructor - '("/home/shepherd/run_pluto.sh") - #:log-file "/home/shepherd/logs/pluto.log") - #:stop (make-kill-destructor) - ;; currently running in a screen session - #:auto-start? #f - #:respawn? #t)) + #:provides '(pluto) + #:docstring "Run a pluto web server" + #:start (make-forkexec-constructor + ;; Update the path to runpluto as the guix-profile changes. + '("/home/shepherd/guix-profiles/pluto/bin/guix" "shell" "--container" "--network" "--no-cwd" "julia-visuals" "--" "/gnu/store/wbci39sd5pqrjrb5ak0lkmv9jhnl35kv-julia-visuals-0.0.0-1.e7d670e/runpluto.sh") + #:log-file "/home/shepherd/logs/pluto.log") + #:stop (make-kill-destructor) + #:respawn? #t)) (register-services pluto) (start pluto) -- cgit v1.2.3