X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fpackages.nix;h=c257dab0a60b3e8ee3167be8e42ebca76242b48c;hb=1bb2ff2cfbffcdc571bc2f8b171ca892c8aebece;hp=2e16a0da89a2963d6a50786338dab2fb6f77b87b;hpb=e379fd29ef6e69eb36652043f0ca825bbc00c222;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/virtual/packages.nix b/virtual/packages.nix
index 2e16a0d..c257dab 100644
--- 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}
-
- DirectoryIndex = index.php
-
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-
-
- '';
+ apache = {
+ user = "wwwrun";
+ group = "wwwrun";
+ vhostConf = ''
+ Alias /adminer ${webRoot}
+
+ DirectoryIndex = index.php
+
+ SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+
+
+ '';
+ };
nginxConf = {
alias = webRoot;
index = "index.php";