X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fisabelle%2Firidologie.nix;h=cd733c1d28c1f284e1a0e80a1864b547669f5374;hb=fa25ffd4583cc362075cd5e1b4130f33306103f0;hp=5fa87cee075a81508d8dcf5390918086d3e5d9cb;hpb=f5761aac8dbfb4af91c232f2b52d1353c899abda;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 5fa87ce..cd733c1 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -10,36 +10,31 @@ let
 
   apacheUser = config.services.httpd.Prod.user;
   apacheGroup = config.services.httpd.Prod.group;
-  webappdir = config.services.websites.webappDirsPaths.isabelle_iridologie;
   secretsPath = config.secrets.fullPaths."websites/isabelle/iridologie";
 in {
   options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website";
 
   config = lib.mkIf cfg.enable {
-    services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir;
-    secrets.keys = [
-      {
-        dest = "websites/isabelle/iridologie";
-        user = apacheUser;
-        group = apacheGroup;
-        permissions = "0400";
-        text = ''
-          SetEnv SPIP_CONFIG_DIR     "${./config}"
-          SetEnv SPIP_VAR_DIR        "${app.varDir}"
-          SetEnv SPIP_SITE           "iridologie-${app.environment}"
-          SetEnv SPIP_LDAP_BASE      "dc=immae,dc=eu"
-          SetEnv SPIP_LDAP_HOST      "ldaps://ldap.immae.eu"
-          SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
-          SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
-          SetEnv SPIP_LDAP_SEARCH    "${icfg.ldap.filter}"
-          SetEnv SPIP_MYSQL_HOST     "${icfg.mysql.host}"
-          SetEnv SPIP_MYSQL_PORT     "${icfg.mysql.port}"
-          SetEnv SPIP_MYSQL_DB       "${icfg.mysql.database}"
-          SetEnv SPIP_MYSQL_USER     "${icfg.mysql.user}"
-          SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"
-        '';
-      }
-    ];
+    secrets.keys."websites/isabelle/iridologie" = {
+      user = apacheUser;
+      group = apacheGroup;
+      permissions = "0400";
+      text = ''
+        SetEnv SPIP_CONFIG_DIR     "${./config}"
+        SetEnv SPIP_VAR_DIR        "${app.varDir}"
+        SetEnv SPIP_SITE           "iridologie-${app.environment}"
+        SetEnv SPIP_LDAP_BASE      "dc=immae,dc=eu"
+        SetEnv SPIP_LDAP_HOST      "ldaps://ldap.immae.eu"
+        SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
+        SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
+        SetEnv SPIP_LDAP_SEARCH    "${icfg.ldap.filter}"
+        SetEnv SPIP_MYSQL_HOST     "${icfg.mysql.host}"
+        SetEnv SPIP_MYSQL_PORT     "${icfg.mysql.port}"
+        SetEnv SPIP_MYSQL_DB       "${icfg.mysql.database}"
+        SetEnv SPIP_MYSQL_USER     "${icfg.mysql.user}"
+        SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"
+      '';
+    };
     services.webstats.sites = [ { name = "iridologie.icommandeur.org"; } ];
 
     systemd.services.phpfpm-isabelle_iridologie.after = lib.mkAfter [ "mysql.service" ];
@@ -70,13 +65,12 @@ in {
         install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
       '';
     };
-    services.websites.webappDirs.isabelle_iridologie = app.webRoot;
     services.websites.env.production.modules = [ "proxy_fcgi" ];
     services.websites.env.production.vhostConfs.isabelle_iridologie = {
       certName     = "isabelle";
       addToCerts   = true;
       hosts        = [ "iridologie.icommandeur.org" "icommandeur.org" "www.icommandeur.org" ];
-      root         = webappdir;
+      root         = app.webRoot;
       extraConfig  = [
         ''
           RewriteEngine On
@@ -91,16 +85,16 @@ in {
             SetHandler "proxy:unix:${config.services.phpfpm.pools.isabelle_iridologie.socket}|fcgi://localhost"
           </FilesMatch>
 
-          <Directory ${webappdir}>
+          <Directory ${app.webRoot}>
             DirectoryIndex index.php index.htm index.html
             Options -Indexes +FollowSymLinks +MultiViews +Includes
-            Include ${webappdir}/htaccess.txt
+            Include ${app.webRoot}/htaccess.txt
 
             AllowOverride AuthConfig FileInfo Limit
             Require all granted
           </Directory>
 
-          <DirectoryMatch "${webappdir}/squelettes">
+          <DirectoryMatch "${app.webRoot}/squelettes">
             Require all denied
           </DirectoryMatch>