diff options
| author | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
| commit | 613ef763a52d7825f062eb7b58354504b64d2869 (patch) | |
| tree | bee086914ed97aab1eaba25c325268e33e57c358 /gnu/services/databases.scm | |
| parent | 86990eeda2a85acd3640059c0b681f1eddbacba0 (diff) | |
| parent | 8a325748fb8c3709beb2c26966a3e3c86831f95e (diff) | |
| download | guix-613ef763a52d7825f062eb7b58354504b64d2869.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/databases.scm')
| -rw-r--r-- | gnu/services/databases.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index b34a67aa95..3ca8f471fc 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -77,8 +77,10 @@ (default 5432)) (locale postgresql-configuration-locale (default "en_US.utf8")) - (config-file postgresql-configuration-file) - (data-directory postgresql-configuration-data-directory)) + (config-file postgresql-configuration-file + (default %default-postgres-config)) + (data-directory postgresql-configuration-data-directory + (default "/var/lib/postgresql/data"))) (define %default-postgres-hba (plain-file "pg_hba.conf" @@ -184,7 +186,8 @@ host all all ::1/128 trust")) (service-extension activation-service-type postgresql-activation) (service-extension account-service-type - (const %postgresql-accounts)))))) + (const %postgresql-accounts)))) + (default-value (postgresql-configuration)))) (define* (postgresql-service #:key (postgresql postgresql) (port 5432) @@ -466,7 +469,8 @@ FLUSH PRIVILEGES; (service-extension activation-service-type %mysql-activation) (service-extension shepherd-root-service-type - mysql-shepherd-service))))) + mysql-shepherd-service))) + (default-value (mysql-configuration)))) (define* (mysql-service #:key (config (mysql-configuration))) "Return a service that runs @command{mysqld}, the MySQL or MariaDB @@ -548,4 +552,5 @@ The optional @var{config} argument specifies the configuration for (service-extension activation-service-type redis-activation) (service-extension account-service-type - (const %redis-accounts)))))) + (const %redis-accounts)))) + (default-value (redis-configuration)))) |