diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/services/databases.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/services/databases.scm')
| -rw-r--r-- | gnu/services/databases.scm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 60b31e0373..d2dc5f0da8 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -38,15 +38,13 @@ #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (<postgresql-config-file> - postgresql-config-file + #:export (postgresql-config-file postgresql-config-file? postgresql-config-file-log-destination postgresql-config-file-hba-file postgresql-config-file-ident-file postgresql-config-file-extra-config - <postgresql-configuration> postgresql-configuration postgresql-configuration? postgresql-configuration-postgresql @@ -59,7 +57,6 @@ postgresql-service-type memcached-service-type - <memcached-configuration> memcached-configuration memcached-configuration? memcached-configuration-memecached @@ -68,7 +65,6 @@ memcached-configuration-udp-port memcached-configuration-additional-options - <mongodb-configuration> mongodb-configuration mongodb-configuration? mongodb-configuration-mongodb @@ -580,14 +576,14 @@ FLUSH PRIVILEGES; ;; The socket is ready! (execl mysql-upgrade mysql-upgrade (string-append "--socket=" #$socket-file)))) - (lambda args - (if (< i timeout) - (begin - (sleep 1) - (loop (+ 1 i))) - ;; No luck, give up. - (throw 'timeout-error - "MySQL server did not appear in time!")))))))))) + (lambda args + (if (< i timeout) + (begin + (sleep 1) + (loop (+ 1 i))) + ;; No luck, give up. + (throw 'timeout-error + "MySQL server did not appear in time!")))))))))) (define (mysql-upgrade-shepherd-service config) (list (shepherd-service |