Remove webappdirs

[perso/Immae/Config/Nix.git] / modules / private / websites / isabelle / aten_integration.nix
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix

index 6f8f985af6ae77d71d6b1d12ca0be7a9c4d3b412..7e0aaf726eeeda00285fedc0c5574cc1e03c85a9 100644 (file)
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -41,8 +41,7 @@ in {
        phpPackage = pkgs.php72;
      };
  
-    secrets.keys = [{
-      dest = "websites/isabelle/aten_integration";
+    secrets.keys."websites/isabelle/aten_integration" = {
        user = config.services.httpd.Inte.user;
        group = config.services.httpd.Inte.group;
        permissions = "0400";
@@ -56,12 +55,12 @@ in {
          SetEnv APP_SECRET   "${secrets.secret}"
          SetEnv DATABASE_URL "${psql_url}"
          '';
-    }];
+    };
      services.websites.env.integration.vhostConfs.isabelle_aten_integration = {
        certName    = "integration";
        addToCerts  = true;
        hosts       = [ "dev.aten.pro" ];
-      root        = pcfg.webappDirs.isabelle_aten_integration;
+      root        = app.webRoot;
        extraConfig = [
          ''
          <FilesMatch "\.php$">
@@ -82,7 +81,7 @@ in {
            ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
          </Location>
  
-        <Directory ${pcfg.webappDirs.isabelle_aten_integration}>
+        <Directory ${app.webRoot}>
            Options Indexes FollowSymLinks MultiViews Includes
            AllowOverride All
            Require all granted