1 files changed, 20 insertions, 23 deletions
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 14296bf..decda36 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -18,29 +18,26 @@ in {
  config = lib.mkIf cfg.enable {
    services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir;
    services.duplyBackup.profiles.isabelle_iridologie.remotes = ["eriomem" "ovh"];
-    secrets.keys = [
+    secrets.keys."websites/isabelle/iridologie" = {
-      {
+      user = apacheUser;
-        dest = "websites/isabelle/iridologie";
+      group = apacheGroup;
-        user = apacheUser;
+      permissions = "0400";
-        group = apacheGroup;
+      text = ''
-        permissions = "0400";
+        SetEnv SPIP_CONFIG_DIR     "${./config}"
-        text = ''
+        SetEnv SPIP_VAR_DIR        "${app.varDir}"
-          SetEnv SPIP_CONFIG_DIR     "${./config}"
+        SetEnv SPIP_SITE           "iridologie-${app.environment}"
-          SetEnv SPIP_VAR_DIR        "${app.varDir}"
+        SetEnv SPIP_LDAP_BASE      "dc=immae,dc=eu"
-          SetEnv SPIP_SITE           "iridologie-${app.environment}"
+        SetEnv SPIP_LDAP_HOST      "ldaps://ldap.immae.eu"
-          SetEnv SPIP_LDAP_BASE      "dc=immae,dc=eu"
+        SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
-          SetEnv SPIP_LDAP_HOST      "ldaps://ldap.immae.eu"
+        SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
-          SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
+        SetEnv SPIP_LDAP_SEARCH    "${icfg.ldap.filter}"
-          SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
+        SetEnv SPIP_MYSQL_HOST     "${icfg.mysql.host}"
-          SetEnv SPIP_LDAP_SEARCH    "${icfg.ldap.filter}"
+        SetEnv SPIP_MYSQL_PORT     "${icfg.mysql.port}"
-          SetEnv SPIP_MYSQL_HOST     "${icfg.mysql.host}"
+        SetEnv SPIP_MYSQL_DB       "${icfg.mysql.database}"
-          SetEnv SPIP_MYSQL_PORT     "${icfg.mysql.port}"
+        SetEnv SPIP_MYSQL_USER     "${icfg.mysql.user}"
-          SetEnv SPIP_MYSQL_DB       "${icfg.mysql.database}"
+        SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"
-          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" ];

diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index 14296bf..decda36 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix
@@ -18,29 +18,26 @@ in {
18	config = lib.mkIf cfg.enable {	18	config = lib.mkIf cfg.enable {
19	services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir;	19	services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir;
20	services.duplyBackup.profiles.isabelle_iridologie.remotes = ["eriomem" "ovh"];	20	services.duplyBackup.profiles.isabelle_iridologie.remotes = ["eriomem" "ovh"];
21	secrets.keys = [	21	secrets.keys."websites/isabelle/iridologie" = {
22	{	22	user = apacheUser;
23	dest = "websites/isabelle/iridologie";	23	group = apacheGroup;
24	user = apacheUser;	24	permissions = "0400";
25	group = apacheGroup;	25	text = ''
26	permissions = "0400";	26	SetEnv SPIP_CONFIG_DIR "${./config}"
27	text = ''	27	SetEnv SPIP_VAR_DIR "${app.varDir}"
28	SetEnv SPIP_CONFIG_DIR "${./config}"	28	SetEnv SPIP_SITE "iridologie-${app.environment}"
29	SetEnv SPIP_VAR_DIR "${app.varDir}"	29	SetEnv SPIP_LDAP_BASE "dc=immae,dc=eu"
30	SetEnv SPIP_SITE "iridologie-${app.environment}"	30	SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu"
31	SetEnv SPIP_LDAP_BASE "dc=immae,dc=eu"	31	SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
32	SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu"	32	SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
33	SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"	33	SetEnv SPIP_LDAP_SEARCH "${icfg.ldap.filter}"
34	SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"	34	SetEnv SPIP_MYSQL_HOST "${icfg.mysql.host}"
35	SetEnv SPIP_LDAP_SEARCH "${icfg.ldap.filter}"	35	SetEnv SPIP_MYSQL_PORT "${icfg.mysql.port}"
36	SetEnv SPIP_MYSQL_HOST "${icfg.mysql.host}"	36	SetEnv SPIP_MYSQL_DB "${icfg.mysql.database}"
37	SetEnv SPIP_MYSQL_PORT "${icfg.mysql.port}"	37	SetEnv SPIP_MYSQL_USER "${icfg.mysql.user}"
38	SetEnv SPIP_MYSQL_DB "${icfg.mysql.database}"	38	SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"
39	SetEnv SPIP_MYSQL_USER "${icfg.mysql.user}"	39	'';
40	SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"	40	};
41	'';
42	}
43	];
44	services.webstats.sites = [ { name = "iridologie.icommandeur.org"; } ];	41	services.webstats.sites = [ { name = "iridologie.icommandeur.org"; } ];
45		42
46	systemd.services.phpfpm-isabelle_iridologie.after = lib.mkAfter [ "mysql.service" ];	43	systemd.services.phpfpm-isabelle_iridologie.after = lib.mkAfter [ "mysql.service" ];