X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Frichie%2Fproduction.nix;h=e95df300cf94db8a8b1faaca8a2afc49695a7ff7;hb=41cce84a02652e22ad967c9f31669092eb3e7f0e;hp=2d85175441abbfebff231b0fa6c225d9cc8877db;hpb=5a61f6ad5164a735be26e016c59e72252ffb49b7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix
index 2d85175..e95df30 100644
--- a/modules/private/websites/richie/production.nix
+++ b/modules/private/websites/richie/production.nix
@@ -17,7 +17,6 @@ let
       sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
       '';
   };
-  webappdir = config.services.websites.webappDirsPaths.richie_production;
   secretPath = config.secrets.fullPaths."websites/richie/production";
   apacheUser = config.services.httpd.Prod.user;
   apacheGroup = config.services.httpd.Prod.group;
@@ -29,8 +28,7 @@ in
     services.duplyBackup.profiles.richie_production.remotes = ["eriomem" "ovh"];
     services.webstats.sites = [ { name = "europe-richie.org"; } ];
 
-    secrets.keys = [{
-      dest = "websites/richie/production";
+    secrets.keys."websites/richie/production" = {
       user = apacheUser;
       group = apacheGroup;
       permissions = "0400";
@@ -48,8 +46,7 @@ in
         $smtp_mailer->Auth('${smtp_mailer.user}', '${smtp_mailer.password}');
         ?>
         '';
-    }];
-    services.websites.webappDirs.richie_production = richieSrc;
+    };
     system.activationScripts.richie_production = {
       deps = [ "httpd" ];
       text = ''
@@ -86,7 +83,7 @@ in
       addToCerts  = true;
       certMainHost = "europe-richie.org";
       hosts       = [ "europe-richie.org" "www.europe-richie.org" ];
-      root        = webappdir;
+      root        = richieSrc;
       extraConfig = [
         ''
         Use Stats europe-richie.org
@@ -94,7 +91,7 @@ in
         <LocationMatch "^/files/.*/admin/">
           Require all denied
         </LocationMatch>
-        <Directory ${webappdir}>
+        <Directory ${richieSrc}>
           DirectoryIndex index.php index.htm index.html
           Options Indexes FollowSymLinks MultiViews Includes
           AllowOverride None