diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-06-11 07:15:01 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-06-11 07:15:01 +0100 |
| commit | 93fdefc7b10da46e26cf29831553d3e4bb7cc7ad (patch) | |
| tree | ece02717acb9fe61c26a249fd57339b4b90ff908 | |
| parent | d7586e88fa57485b21b0e6d64732583a07aee9ac (diff) | |
| download | data-service-93fdefc7b10da46e26cf29831553d3e4bb7cc7ad.tar data-service-93fdefc7b10da46e26cf29831553d3e4bb7cc7ad.tar.gz | |
Pass the --db-client option to sqitch deploy
So that it can always find psql.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | guix-data-service/config.scm.in | 1 | ||||
| -rw-r--r-- | scripts/guix-data-service.in | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ccf2071..7952277 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AC_SUBST([guilemoduledir]) AC_SUBST([GUILE_EFFECTIVE_VERSION]) AC_PATH_PROG([sqitch], [sqitch]) +AC_PATH_PROG([psql], [psql]) dnl Substitute placeholders to generate these target files AC_CONFIG_FILES([Makefile]) diff --git a/guix-data-service/config.scm.in b/guix-data-service/config.scm.in index 59a654a..12572c2 100644 --- a/guix-data-service/config.scm.in +++ b/guix-data-service/config.scm.in @@ -34,6 +34,7 @@ (port . 8765) (sqitch . "@sqitch@") + (sqitch-psql . "@psql@") (sqitch-plan . ,(let ((installed-plan "@prefix@/share/guix-data-service/sqitch/sqitch.plan") (dev-plan diff --git a/scripts/guix-data-service.in b/scripts/guix-data-service.in index 227c86f..cd8985b 100644 --- a/scripts/guix-data-service.in +++ b/scripts/guix-data-service.in @@ -71,6 +71,7 @@ (let ((command (list (%config 'sqitch) "deploy" + "--db-client" (%config 'sqitch-psql) "--plan-file" (%config 'sqitch-plan) (string-append "db:pg://" (%config 'database-user) |