X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fdatabases%2Fmariadb.nix;h=ed647ea662f5b5e96c2a603ffa4db6dc60541e9a;hb=981fa80354fd6f00f49446777c38f77bd8a65f65;hp=632306cf23193c3caf96aec68a5cdaae637afc7c;hpb=9f6a78629aad1d22dc8b928860fd05eb40f07352;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/databases/mariadb.nix b/modules/private/databases/mariadb.nix
index 632306c..ed647ea 100644
--- a/modules/private/databases/mariadb.nix
+++ b/modules/private/databases/mariadb.nix
@@ -96,20 +96,24 @@ in {
       dataDir = cfg.dataDir;
       extraOptions = ''
         ssl_ca = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
-        ssl_key = ${config.security.acme.directory}/mysql/key.pem
-        ssl_cert = ${config.security.acme.directory}/mysql/fullchain.pem
+        ssl_key = ${config.security.acme2.certs.mysql.directory}/key.pem
+        ssl_cert = ${config.security.acme2.certs.mysql.directory}/fullchain.pem
 
         # for replication
         log-bin=mariadb-bin
         server-id=1
+
+        # this introduces a small delay before storing on disk, but
+        # makes it order of magnitudes quicker
+        innodb_flush_log_at_trx_commit = 0
         '';
     };
 
     users.users.mysql.extraGroups = [ "keys" ];
-    security.acme.certs."mysql" = config.myServices.databasesCerts // {
+    security.acme2.certs."mysql" = config.myServices.databasesCerts // {
       user = "mysql";
       group = "mysql";
-      plugins = [ "fullchain.pem" "key.pem" "account_key.json" ];
+      plugins = [ "fullchain.pem" "key.pem" "account_key.json" "account_reg.json" ];
       domain = "db-1.immae.eu";
       postRun = ''
         systemctl restart mysql.service