X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fcommons%2Fadminer.nix;h=e91134797acf8a4bb7897daf0523dacb04c46687;hp=ab789b3919046d9c60c5d9238ea32102115247e9;hb=7da817e32f5e285f5fe09726f6031d8c6d4c74ea;hpb=d21de7a044cc39c452306880707f79162b666b60
diff --git a/nixops/modules/websites/commons/adminer.nix b/nixops/modules/websites/commons/adminer.nix
index ab789b3..e911347 100644
--- a/nixops/modules/websites/commons/adminer.nix
+++ b/nixops/modules/websites/commons/adminer.nix
@@ -1,68 +1,40 @@
-{ stdenv, fetchurl, nginx }:
-let
- adminer = rec {
- webRoot = stdenv.mkDerivation rec {
- version = "4.7.0";
- name = "adminer-${version}";
- src = fetchurl {
- url = "https://www.adminer.org/static/download/${version}/${name}.php";
- sha256 = "1qq2g7rbfh2vrqfm3g0bz0qs057b049n0mhabnsbd1sgnpvnc5z7";
- };
- phases = "installPhase";
- installPhase = ''
- mkdir -p $out
- cp $src $out/index.php
+{ stdenv, fetchurl, webapps }:
+rec {
+ webRoot = webapps.adminer;
+ phpFpm = rec {
+ socket = "/var/run/phpfpm/adminer.sock";
+ pool = ''
+ listen = ${socket}
+ 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
+ ;php_admin_flag[log_errors] = on
+ ; Needed to avoid clashes in browser cookies (same domain)
+ php_value[session.name] = AdminerPHPSESSID
+ php_admin_value[open_basedir] = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer"
+ php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer"
+ php_admin_value[upload_tmp_dir] = "/var/lib/php/tmp/adminer"
'';
- };
- phpFpm = rec {
- socket = "/var/run/phpfpm/adminer.sock";
- pool = ''
- listen = ${socket}
- 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
- ;php_admin_flag[log_errors] = on
- ; Needed to avoid clashes in browser cookies (same domain)
- php_value[session.name] = AdminerPHPSESSID
- php_admin_value[open_basedir] = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer"
- php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer"
- php_admin_value[upload_tmp_dir] = "/var/lib/php/tmp/adminer"
- '';
- };
- apache = rec {
- user = "wwwrun";
- group = "wwwrun";
- modules = [ "proxy_fcgi" ];
- webappName = "_adminer";
- root = "/run/current-system/webapps/${webappName}";
- vhostConf = ''
- Alias /adminer ${root}
-
- DirectoryIndex index.php
- Require all granted
-
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-
-
- '';
- };
- nginxConf = {
- alias = webRoot;
- index = "index.php";
- extraConfig = ''
- include ${nginx}/conf/fastcgi.conf;
- fastcgi_split_path_info ^(.+?\.php)(/.*)$;
- fastcgi_param HTTP_PROXY "";
- fastcgi_param SCRIPT_FILENAME ${webRoot}/index.php;
- fastcgi_pass unix:${phpFpm.socket};
- fastcgi_index index.php;
- fastcgi_intercept_errors on;
- '';
- };
};
-in
- adminer
+ apache = rec {
+ user = "wwwrun";
+ group = "wwwrun";
+ modules = [ "proxy_fcgi" ];
+ webappName = "_adminer";
+ root = "/run/current-system/webapps/${webappName}";
+ vhostConf = ''
+ Alias /adminer ${root}
+
+ DirectoryIndex index.php
+ Require all granted
+
+ SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+
+
+ '';
+ };
+}