diff options
Diffstat (limited to 'gn/services')
| -rw-r--r-- | gn/services/bnw-container.scm | 2 | ||||
| -rw-r--r-- | gn/services/databases.scm | 33 | ||||
| -rw-r--r-- | gn/services/discourse.scm | 5 | ||||
| -rw-r--r-- | gn/services/genecup-container.scm | 3 | ||||
| -rw-r--r-- | gn/services/gitea-container.scm | 2 | ||||
| -rw-r--r-- | gn/services/pluto.scm | 3 |
6 files changed, 37 insertions, 11 deletions
diff --git a/gn/services/bnw-container.scm b/gn/services/bnw-container.scm index 4309f75..723e063 100644 --- a/gn/services/bnw-container.scm +++ b/gn/services/bnw-container.scm @@ -84,7 +84,7 @@ ;; We don't need any packages inside the container. (packages (list coreutils)) - (services (list (service dhcp-client-service-type) + (services (list (service dhcp-service-type) (service bnw-service-type ;; The following is for testing: ;(bnw-configuration diff --git a/gn/services/databases.scm b/gn/services/databases.scm index 937aa9e..fbdf39e 100644 --- a/gn/services/databases.scm +++ b/gn/services/databases.scm @@ -34,7 +34,7 @@ (server-port virtuoso-configuration-server-port (default 1111)) (dirs-allowed virtuoso-dirs-allowed - (default "/var/genenetwork/virtuoso-data")) + (default (list "/var/genenetwork/virtuoso-data"))) (number-of-buffers virtuoso-configuration-number-of-buffers (default #f)) (maximum-dirty-buffers virtuoso-configuration-maximum-dirty-buffers @@ -42,7 +42,22 @@ (http-server-ip virtuoso-configuration-http-server-ip (default "localhost")) (http-server-port virtuoso-configuration-http-server-port - (default 8890))) + (default 8890)) + (checkpoint-interval virtuoso-configuration-checkpoint-interval + (default "60")) + (scheduler-interval virtuoso-configuration-scheduler-interval + (default "10")) + ;; Database settings + (database-file virtuoso-configuration-database-file + (default "/var/lib/virtuoso/virtuoso.db")) + (lock-file virtuoso-configuration-lock-file + (default "/var/lib/virtuoso/virtuoso.lck")) + (transaction-file virtuoso-configuration-transaction-file + (default "/var/lib/virtuoso/virtuoso.trx")) + (error-log-file virtuoso-configuration-error-log-file + (default "/var/lib/virtuoso/virtuoso-errors.log")) + (syslog virtuoso-configuration-syslog + (default "0"))) (define (virtuoso-activation config) (with-imported-modules '((guix build utils)) @@ -67,6 +82,7 @@ (home-directory "/var/lib/virtuoso") (shell (file-append shadow "/sbin/nologin"))))) + (define (virtuoso-shepherd-service config) (shepherd-service (documentation "Run Virtuoso.") @@ -86,9 +102,9 @@ (format port "ServerPort = ~a:~a~%" #$(virtuoso-configuration-server-ip config) #$(virtuoso-configuration-server-port config))) - (when #$(virtuoso-dirs-allowed config) + (when #$(>= (length (virtuoso-dirs-allowed config)) 1) (format port "DirsAllowed = ~a~%" - #$(virtuoso-dirs-allowed config))) + #$(string-join (virtuoso-dirs-allowed config) ","))) (when #$(virtuoso-configuration-number-of-buffers config) (format port "NumberOfBuffers = ~a~%" #$(virtuoso-configuration-number-of-buffers config))) @@ -100,7 +116,14 @@ (format port "[HTTPServer]~%") (format port "ServerPort = ~a:~a~%" #$(virtuoso-configuration-http-server-ip config) - #$(virtuoso-configuration-http-server-port config))))))) + #$(virtuoso-configuration-http-server-port config))) + (format port + "[Database]~%DatabaseFile = ~a~%LockFile = ~a~%TransactionFile = ~a~%ErrorLogFile = ~a~%Syslog = ~a~%" + #$(virtuoso-configuration-database-file config) + #$(virtuoso-configuration-lock-file config) + #$(virtuoso-configuration-transaction-file config) + #$(virtuoso-configuration-error-log-file config) + #$(virtuoso-configuration-syslog config)))))) #:directory #$(virtuoso-configuration-state-directory config) #:user "virtuoso" #:group "virtuoso" diff --git a/gn/services/discourse.scm b/gn/services/discourse.scm index 0074c7b..feebb98 100644 --- a/gn/services/discourse.scm +++ b/gn/services/discourse.scm @@ -4,7 +4,8 @@ (gn packages ruby) (guix modules) (guix records) - (ice-9 match)) + (ice-9 match) + (gnu packages ruby-check)) (use-service-modules networking shepherd web) (use-package-modules node ruby) @@ -120,7 +121,7 @@ (list node) %base-packages)) - (services (list (service dhcp-client-service-type) + (services (list (service dhcp-service-type) (service discourse-service-type ;; The following is for testing: ;(discourse-configuration diff --git a/gn/services/genecup-container.scm b/gn/services/genecup-container.scm index 42ad097..d61ed80 100644 --- a/gn/services/genecup-container.scm +++ b/gn/services/genecup-container.scm @@ -6,7 +6,8 @@ (guix modules) (guix packages) (guix records) - (ice-9 match)) + (ice-9 match) + ((gnu packages nss) #:select (nss-certs))) (use-service-modules shepherd) (use-package-modules certs compression) diff --git a/gn/services/gitea-container.scm b/gn/services/gitea-container.scm index 5e707ec..397e6fb 100644 --- a/gn/services/gitea-container.scm +++ b/gn/services/gitea-container.scm @@ -90,5 +90,5 @@ (id 998)) %base-groups)) - (services (list (service dhcp-client-service-type) + (services (list (service dhcp-service-type) (service gitea-service-type)))) diff --git a/gn/services/pluto.scm b/gn/services/pluto.scm index 420e2cf..c6dc40f 100644 --- a/gn/services/pluto.scm +++ b/gn/services/pluto.scm @@ -4,7 +4,8 @@ (gn packages julia) (guix modules) (guix records) - (ice-9 match)) + (ice-9 match) + ((gnu packages nss) #:select (nss-certs))) (use-service-modules shepherd) (use-package-modules admin |