diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-06-08 10:28:03 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-06-08 10:28:03 +0100 |
| commit | 64be346c8db1874a8b2289d008089ccc202aed5d (patch) | |
| tree | 152d1b67c333596b87af4cbabdda65c95950117b | |
| parent | 88922d9f11554288956ad002c04094022a7db84d (diff) | |
| download | data-service-64be346c8db1874a8b2289d008089ccc202aed5d.tar data-service-64be346c8db1874a8b2289d008089ccc202aed5d.tar.gz | |
Add sqitch and asset related config values
| -rw-r--r-- | guix-data-service/config.scm.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/guix-data-service/config.scm.in b/guix-data-service/config.scm.in index ad6452a..59a654a 100644 --- a/guix-data-service/config.scm.in +++ b/guix-data-service/config.scm.in @@ -23,16 +23,24 @@ (let ((config ;; Try to find the "assets" directory relative to the executable ;; first. This is useful when using "pre-inst-env". - `((assets-dir . ,(let ((maybe-dir + `((assets-dir . ,(let ((install-dir + "@prefix@/share/guix-data-service/assets") + (dev-dir (string-append (getcwd) "/assets"))) - (if (file-exists? maybe-dir) - maybe-dir - ;; TODO: use @assetsdir@ variable here - "@prefix@/share/guix-data-service/assets"))) + (if (file-exists? install-dir) + install-dir + dev-dir))) (host . "localhost") (port . 8765) (sqitch . "@sqitch@") + (sqitch-plan . ,(let ((installed-plan + "@prefix@/share/guix-data-service/sqitch/sqitch.plan") + (dev-plan + (string-append (getcwd) "/sqitch/sqitch.plan"))) + (if (file-exists? installed-plan) + installed-plan + dev-plan))) (database-user . "guix_data_service") (database-host . "localhost") |