X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=nixops%2Fmodules%2Fwebsites%2Faten%2Faten.nix;h=e27688d26c23014713b1adb1666ffb5e120c072e;hb=7636abc6bfcdca34d4b90a144365235012275339;hp=69e1d4c37409cee35bf0ee9cf415da9e53666aea;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index 69e1d4c..e27688d 100644
--- a/nixops/modules/websites/aten/aten.nix
+++ b/nixops/modules/websites/aten/aten.nix
@@ -1,4 +1,4 @@
-{ lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, binutils, python, nodejs, libsass, yarn2nix }:
+{ lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, python, nodejs, libsass, yarn2nix }:
 let
   aten = { config }: rec {
     environment = config.environment;
@@ -29,10 +29,12 @@ let
         pm.max_spare_servers = 3
         ''}'';
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "aten_${environment}";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
       <FilesMatch "\.php$">
         SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
@@ -64,7 +66,7 @@ let
       </Location>
       ''}
 
-      <Directory ${webRoot}>
+      <Directory ${root}>
         Options Indexes FollowSymLinks MultiViews Includes
         AllowOverride All
         Require all granted
@@ -96,7 +98,7 @@ let
           yarnLock = "${info.src}/yarn.lock";
           pkgConfig = {
             node-sass = {
-              buildInputs = [ binutils libsass python ];
+              buildInputs = [ libsass python ];
               postInstall = let
                 nodeHeaders = fetchurl {
                   url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
@@ -104,7 +106,6 @@ let
                 };
               in
                 ''
-                  export AR=${binutils.bintools}/bin/ar
                   node scripts/build.js --tarball=${nodeHeaders}
                 '';
             };
@@ -128,7 +129,7 @@ let
           rm -rf var/{log,cache}
           ln -sf ../../../../../../../${varDir}/{log,cache} var/
           '';
-        buildInputs = [ yarn2nix.yarn ];
+        buildInputs = [ yarnModules yarn2nix yarn2nix.yarn ];
       });
     webRoot = "${webappDir}/public";
   };