diff options
Diffstat (limited to 'modules/private')
-rw-r--r-- | modules/private/databases/mariadb.nix | 4 | ||||
-rw-r--r-- | modules/private/databases/openldap/default.nix | 6 | ||||
-rw-r--r-- | modules/private/databases/postgresql.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/private/databases/mariadb.nix b/modules/private/databases/mariadb.nix index 21f4359..cc99c3c 100644 --- a/modules/private/databases/mariadb.nix +++ b/modules/private/databases/mariadb.nix | |||
@@ -54,8 +54,8 @@ in { | |||
54 | dataDir = cfg.dataDir; | 54 | dataDir = cfg.dataDir; |
55 | extraOptions = '' | 55 | extraOptions = '' |
56 | ssl_ca = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt | 56 | ssl_ca = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt |
57 | ssl_key = /var/lib/acme/mysql/key.pem | 57 | ssl_key = ${config.security.acme.directory}/mysql/key.pem |
58 | ssl_cert = /var/lib/acme/mysql/fullchain.pem | 58 | ssl_cert = ${config.security.acme.directory}/mysql/fullchain.pem |
59 | ''; | 59 | ''; |
60 | }; | 60 | }; |
61 | 61 | ||
diff --git a/modules/private/databases/openldap/default.nix b/modules/private/databases/openldap/default.nix index 850f3ff..46f85d2 100644 --- a/modules/private/databases/openldap/default.nix +++ b/modules/private/databases/openldap/default.nix | |||
@@ -33,9 +33,9 @@ let | |||
33 | directory ${cfg.dataDir} | 33 | directory ${cfg.dataDir} |
34 | overlay memberof | 34 | overlay memberof |
35 | 35 | ||
36 | TLSCertificateFile /var/lib/acme/ldap/cert.pem | 36 | TLSCertificateFile ${config.security.acme.directory}/ldap/cert.pem |
37 | TLSCertificateKeyFile /var/lib/acme/ldap/key.pem | 37 | TLSCertificateKeyFile ${config.security.acme.directory}/ldap/key.pem |
38 | TLSCACertificateFile /var/lib/acme/ldap/fullchain.pem | 38 | TLSCACertificateFile ${config.security.acme.directory}/ldap/fullchain.pem |
39 | TLSCACertificatePath ${pkgs.cacert.unbundled}/etc/ssl/certs/ | 39 | TLSCACertificatePath ${pkgs.cacert.unbundled}/etc/ssl/certs/ |
40 | #This makes openldap crash | 40 | #This makes openldap crash |
41 | #TLSCipherSuite DEFAULT | 41 | #TLSCipherSuite DEFAULT |
diff --git a/modules/private/databases/postgresql.nix b/modules/private/databases/postgresql.nix index 26242a8..8c36d84 100644 --- a/modules/private/databases/postgresql.nix +++ b/modules/private/databases/postgresql.nix | |||
@@ -73,8 +73,8 @@ in { | |||
73 | lc_time = 'en_US.UTF-8' | 73 | lc_time = 'en_US.UTF-8' |
74 | default_text_search_config = 'pg_catalog.english' | 74 | default_text_search_config = 'pg_catalog.english' |
75 | ssl = on | 75 | ssl = on |
76 | ssl_cert_file = '/var/lib/acme/postgresql/fullchain.pem' | 76 | ssl_cert_file = '${config.security.acme.directory}/postgresql/fullchain.pem' |
77 | ssl_key_file = '/var/lib/acme/postgresql/key.pem' | 77 | ssl_key_file = '${config.security.acme.directory}/postgresql/key.pem' |
78 | ''; | 78 | ''; |
79 | authentication = '' | 79 | authentication = '' |
80 | local all postgres ident | 80 | local all postgres ident |