X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;h=768de84c63e173bfdaea6d12e45c76763d63b306;hb=27e22b76e2f7d402c1556d6bbf99cf5e1316f9d4;hp=38f753c7f1469602aba7846b05c59d5deefab64b;hpb=cbc248ed9c13781b3beca56c902531b3ae056041;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 38f753c..768de84 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -53,18 +53,7 @@
         log_level = notice
         '';
       poolConfigs = {
-        adminer = ''
-          listen = /var/run/phpfpm/adminer.sock
-          user = wwwrun
-          group = wwwrun
-          listen.owner = wwwrun
-          listen.group = wwwrun
-          pm = ondemand
-          pm.max_children = 5
-          pm.process_idle_timeout = 60
-          ;php_admin_flag[log_errors] = on
-          php_admin_value[open_basedir] = "${mypkgs.adminer}:/tmp"
-          '';
+        adminer = mypkgs.adminer.phpFpm.pool;
         www = ''
           listen = /var/run/phpfpm/www.sock
           user = wwwrun
@@ -106,15 +95,9 @@
           listen = [ { ip = "*"; port = 443; } ];
           hostName = "db-1.immae.eu";
           documentRoot = null;
-          extraConfig = ''
-            Alias /adminer ${mypkgs.adminer}
-            <Directory ${mypkgs.adminer}>
-              DirectoryIndex = index.php
-              <FilesMatch "\.php$">
-                SetHandler "proxy:unix:/var/run/phpfpm/adminer.sock|fcgi://localhost"
-              </FilesMatch>
-            </Directory>
-            '';
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.adminer.apacheConf
+          ];
         })
         { # Should go last, default fallback
           listen = [ { ip = "*"; port = 80; } ];
@@ -160,6 +143,7 @@
     # FIXME: backup
     # FIXME: restart after pam
     # FIXME: pam access doesn’t work (because of php module)
+    # FIXME: ssl
     services.mysql = rec {
       enable = true;
       package = pkgs.mariadb.overrideAttrs(old: rec {
@@ -170,6 +154,7 @@
 
     # FIXME: initial sync
     # FIXME: backup
+    # FIXME: ssl
     services.postgresql = rec {
       enable = true;
       package = pkgs.postgresql100.overrideAttrs(old: rec {