Move tools websites to stable web directories

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / rompr.nix

diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix
index 055334ebefc8a01c3eab77882934f79388bfb3c9..baee2eb683068e021f7ca83fc3230a4c6c2c28c7 100644 (file)
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -14,14 +14,16 @@ let
         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>
         '';
     };