From 5dbe7ba1ad4a46c71cbf0e189de3f3436a530c0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 6 May 2019 01:41:39 +0200 Subject: [PATCH] Move rompr to pkgs --- .../modules/websites/tools/tools/default.nix | 2 +- nixops/modules/websites/tools/tools/rompr.nix | 150 ++++++++---------- pkgs/webapps/default.nix | 2 + pkgs/webapps/rompr/default.nix | 8 + .../tools => pkgs/webapps/rompr}/rompr.json | 0 5 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 pkgs/webapps/rompr/default.nix rename {nixops/modules/websites/tools/tools => pkgs/webapps/rompr}/rompr.json (100%) diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index e872224..95679f6 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix @@ -23,7 +23,7 @@ let env = myconfig.env.tools.yourls; }; rompr = pkgs.callPackage ./rompr.nix { - inherit (mylibs) fetchedGithub; + inherit (pkgs.webapps) rompr; env = myconfig.env.tools.rompr; }; shaarli = pkgs.callPackage ./shaarli.nix { diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix index ca93bea..fea59fc 100644 --- a/nixops/modules/websites/tools/tools/rompr.nix +++ b/nixops/modules/websites/tools/tools/rompr.nix @@ -1,87 +1,77 @@ -{ lib, env, stdenv, fetchedGithub }: -let - rompr = let - in rec { - varDir = "/var/lib/rompr"; - activationScript = '' - install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ - ${varDir}/prefs ${varDir}/albumart ${varDir}/phpSessions - ''; - webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec { - installPhase = '' - cp -a . $out - ln -sf ${varDir}/prefs $out/prefs - ln -sf ${varDir}/albumart $out/albumart - ''; - }); - apache = rec { - user = "wwwrun"; - group = "wwwrun"; - modules = [ "headers" "mime" "proxy_fcgi" ]; - webappName = "tools_rompr"; - root = "/run/current-system/webapps/${webappName}"; - vhostConf = '' - Alias /rompr ${root} +{ lib, env, rompr }: +rec { + varDir = "/var/lib/rompr"; + activationScript = '' + install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ + ${varDir}/prefs ${varDir}/albumart ${varDir}/phpSessions + ''; + webRoot = rompr; + apache = rec { + user = "wwwrun"; + group = "wwwrun"; + modules = [ "headers" "mime" "proxy_fcgi" ]; + webappName = "tools_rompr"; + root = "/run/current-system/webapps/${webappName}"; + vhostConf = '' + Alias /rompr ${root} - - Options Indexes FollowSymLinks - DirectoryIndex index.php - AllowOverride all - Require all granted - Order allow,deny - Allow from all - ErrorDocument 404 /rompr/404.php - AddType image/x-icon .ico + + Options Indexes FollowSymLinks + DirectoryIndex index.php + AllowOverride all + Require all granted + Order allow,deny + Allow from all + ErrorDocument 404 /rompr/404.php + AddType image/x-icon .ico - - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" - - + + SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + + - - Header Set Cache-Control "max-age=0, no-store" - Header Set Cache-Control "no-cache, must-revalidate" - + + Header Set Cache-Control "max-age=0, no-store" + Header Set Cache-Control "no-cache, must-revalidate" + - - Header Set Cache-Control "max-age=0, no-store" - Header Set Cache-Control "no-cache, must-revalidate" - + + Header Set Cache-Control "max-age=0, no-store" + Header Set Cache-Control "no-cache, must-revalidate" + - - Use LDAPConnect - Require ldap-group cn=users,cn=mpd,ou=services,dc=immae,dc=eu - - ''; - }; - phpFpm = rec { - basedir = builtins.concatStringsSep ":" [ webRoot varDir ]; - socket = "/var/run/phpfpm/rompr.sock"; - pool = '' - listen = ${socket} - user = ${apache.user} - group = ${apache.group} - listen.owner = ${apache.user} - listen.group = ${apache.group} - pm = ondemand - pm.max_children = 60 - pm.process_idle_timeout = 60 + + Use LDAPConnect + Require ldap-group cn=users,cn=mpd,ou=services,dc=immae,dc=eu + + ''; + }; + phpFpm = rec { + basedir = builtins.concatStringsSep ":" [ webRoot varDir ]; + socket = "/var/run/phpfpm/rompr.sock"; + pool = '' + listen = ${socket} + user = ${apache.user} + group = ${apache.group} + listen.owner = ${apache.user} + listen.group = ${apache.group} + pm = ondemand + pm.max_children = 60 + pm.process_idle_timeout = 60 - ; Needed to avoid clashes in browser cookies (same domain) - php_value[session.name] = RomprPHPSESSID - php_admin_value[open_basedir] = "${basedir}:/tmp" - php_admin_value[session.save_path] = "${varDir}/phpSessions" - php_flag[magic_quotes_gpc] = Off - php_flag[track_vars] = On - php_flag[register_globals] = Off - php_admin_flag[allow_url_fopen] = On - php_value[include_path] = ${webRoot} - php_admin_value[upload_tmp_dir] = "${varDir}/prefs" - php_admin_value[post_max_size] = 32M - php_admin_value[upload_max_filesize] = 32M - php_admin_value[memory_limit] = 256M - ''; - }; + ; Needed to avoid clashes in browser cookies (same domain) + php_value[session.name] = RomprPHPSESSID + php_admin_value[open_basedir] = "${basedir}:/tmp" + php_admin_value[session.save_path] = "${varDir}/phpSessions" + php_flag[magic_quotes_gpc] = Off + php_flag[track_vars] = On + php_flag[register_globals] = Off + php_admin_flag[allow_url_fopen] = On + php_value[include_path] = ${webRoot} + php_admin_value[upload_tmp_dir] = "${varDir}/prefs" + php_admin_value[post_max_size] = 32M + php_admin_value[upload_max_filesize] = 32M + php_admin_value[memory_limit] = 256M + ''; }; -in - rompr +} diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix index 7e04e8d..50c3543 100644 --- a/pkgs/webapps/default.nix +++ b/pkgs/webapps/default.nix @@ -23,4 +23,6 @@ rec { (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; }); phpldapadmin = callPackage ./phpldapadmin {}; + + rompr = callPackage ./rompr { inherit mylibs; }; } diff --git a/pkgs/webapps/rompr/default.nix b/pkgs/webapps/rompr/default.nix new file mode 100644 index 0000000..2accf00 --- /dev/null +++ b/pkgs/webapps/rompr/default.nix @@ -0,0 +1,8 @@ +{ varDir ? "/var/lib/rompr", stdenv, mylibs }: +stdenv.mkDerivation (mylibs.fetchedGithub ./rompr.json // { + installPhase = '' + cp -a . $out + ln -sf ${varDir}/prefs $out/prefs + ln -sf ${varDir}/albumart $out/albumart + ''; +}) diff --git a/nixops/modules/websites/tools/tools/rompr.json b/pkgs/webapps/rompr/rompr.json similarity index 100% rename from nixops/modules/websites/tools/tools/rompr.json rename to pkgs/webapps/rompr/rompr.json -- 2.41.0