From 1e6b9c6e164df01ecf1b255fa95a246f698a8c34 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 18 Jan 2018 22:45:26 +0000 Subject: services: postgresql: Add a default-value to the postgresql-service-type. * gnu/packages/databases.scm () [config-file,data-directory]: Add default. (postgresql-service-type)[default-value]: Set to (postgresql-configuration). --- gnu/services/databases.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/services/databases.scm') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index b34a67aa95..3db9472ee3 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) -- cgit 1.4.1 From e903738f86a0be92c5c8c56adc71f8177c14f49a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 18 Jan 2018 22:45:35 +0000 Subject: services: mysql: Add a default-value to the mysql-service-type. * gnu/services/databases.scm (mysql-service-type)[default-value]: Set to (mysql-configuration). --- gnu/services/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/services/databases.scm') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 3db9472ee3..1d56015b75 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -469,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 -- cgit 1.4.1 From bc037c1bd1a10ea00e260cf2ce184120c2c6fb3c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 18 Jan 2018 22:45:40 +0000 Subject: services: redis: Add a default-value to the redis-service-type. * gnu/packages/databases.scm (redis-service-type)[default-value]: Set to (redis-configuration). --- gnu/services/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/services/databases.scm') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 1d56015b75..3ca8f471fc 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -552,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)))) -- cgit 1.4.1