Refactor a bit configurations

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index fd72608aecbd8380d08fe00901ff9dd40b9cb87b..c3470293e29c9de57bb3e6d641978506268baa9f 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -101,7 +101,7 @@
           hostName = "db-1.immae.eu";
           documentRoot = null;
           extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.adminer.apacheConf
+            mypkgs.adminer.apache.vhostConf
           ];
         })
         (withSSL "eldiron" // {
@@ -109,7 +109,7 @@
           hostName = "tools.immae.eu";
           documentRoot = null;
           extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.adminer.apacheConf
+            mypkgs.adminer.apache.vhostConf
           ];
         })
         { # Should go last, default fallback

diff --git a/virtual/packages.nix b/virtual/packages.nix
index 2e16a0da89a2963d6a50786338dab2fb6f77b87b..c257dab0a60b3e8ee3167be8e42ebca76242b48c 100644 (file)
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -8,9 +8,10 @@ with import (builtins.fetchTarball {
 let
   adminer = rec {
     webRoot = pkgs.stdenv.mkDerivation rec {
-      name = "adminer-4.7.0";
+      version = "4.7.0";
+      name = "adminer-${version}";
       src = pkgs.fetchurl {
-        url = "https://www.adminer.org/static/download/4.7.0/${name}.php";
+        url = "https://www.adminer.org/static/download/${version}/${name}.php";
         sha256 = "1qq2g7rbfh2vrqfm3g0bz0qs057b049n0mhabnsbd1sgnpvnc5z7";
       };
       phases = "installPhase";
@@ -23,10 +24,10 @@ let
       socket = "/var/run/phpfpm/adminer.sock";
       pool = ''
         listen = ${socket}
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
+        user = ${apache.user}
+        group = ${apache.group}
+        listen.owner = ${apache.user}
+        listen.group = ${apache.group}
         pm = ondemand
         pm.max_children = 5
         pm.process_idle_timeout = 60
@@ -34,15 +35,19 @@ let
         php_admin_value[open_basedir] = "${webRoot}:/tmp"
         '';
     };
-    apacheConf = ''
-      Alias /adminer ${webRoot}
-      <Directory ${webRoot}>
-        DirectoryIndex = index.php
-        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-        </FilesMatch>
-      </Directory>
-      '';
+    apache = {
+      user = "wwwrun";
+      group = "wwwrun";
+      vhostConf = ''
+        Alias /adminer ${webRoot}
+        <Directory ${webRoot}>
+          DirectoryIndex = index.php
+          <FilesMatch "\.php$">
+            SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          </FilesMatch>
+        </Directory>
+        '';
+    };
     nginxConf = {
       alias = webRoot;
       index = "index.php";