X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Frompr.nix;h=fea59fc9957ba664f98f02db6722292433fa3211;hb=5dbe7ba1ad4a46c71cbf0e189de3f3436a530c0d;hp=055334ebefc8a01c3eab77882934f79388bfb3c9;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix
index 055334e..fea59fc 100644
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -1,86 +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 = {
- user = "wwwrun";
- group = "wwwrun";
- modules = [ "headers" "mime" "proxy_fcgi" ];
- vhostConf = ''
- Alias /rompr ${webRoot}
+{ 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
- Require local
-
- '';
- };
- 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
+}