X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Frompr.nix;h=ca93bead97777411d86b60df0d2e6c0260cee6f4;hb=3c8d7f8706433ce0f995f3bf37fdfd348fb9e173;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..ca93bea 100644
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -10,18 +10,20 @@ let
     webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec {
       installPhase = ''
         cp -a . $out
-        ln -sf ../../../../../../${varDir}/prefs $out/prefs
-        ln -sf ../../../../../../${varDir}/albumart $out/albumart
+        ln -sf ${varDir}/prefs $out/prefs
+        ln -sf ${varDir}/albumart $out/albumart
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "headers" "mime" "proxy_fcgi" ];
+      webappName = "tools_rompr";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /rompr ${webRoot}
+        Alias /rompr ${root}
 
-        <Directory ${webRoot}>
+        <Directory ${root}>
           Options Indexes FollowSymLinks
           DirectoryIndex index.php
           AllowOverride all
@@ -36,12 +38,12 @@ let
           </FilesMatch>
         </Directory>
 
-        <Directory ${webRoot}/albumart/small>
+        <Directory ${root}/albumart/small>
             Header Set Cache-Control "max-age=0, no-store"
             Header Set Cache-Control "no-cache, must-revalidate"
         </Directory>
 
-        <Directory ${webRoot}/albumart/asdownloaded>
+        <Directory ${root}/albumart/asdownloaded>
             Header Set Cache-Control "max-age=0, no-store"
             Header Set Cache-Control "no-cache, must-revalidate"
         </Directory>
@@ -49,7 +51,6 @@ let
         <LocationMatch "^/rompr">
           Use LDAPConnect
           Require ldap-group   cn=users,cn=mpd,ou=services,dc=immae,dc=eu
-          Require local
         </LocationMatch>
         '';
     };