X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fenvironment.nix;h=e469138a9fa51928560520ebd1f5e74b745d0b41;hb=f095eb9cb6c8088ee44fa7a8b7ef13f7e18b134f;hp=1b4721074804adf10d5ec0818ed81c7fefbb7de1;hpb=965b61c2d82ce9df9d71b5a2b3a550eb1ee09646;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/environment.nix b/modules/private/environment.nix
index 1b47210..e469138 100644
--- a/modules/private/environment.nix
+++ b/modules/private/environment.nix
@@ -871,13 +871,15 @@ in
                 pythonPathHome = mkOption { type = bool; description = "Whether to add project’s python home to python path"; };
                 workerPort = mkOption { type = port; description = "Port for the worker"; };
                 secrets = mkOption {
-                  type = attrsOf str;
-                  description = "Secrets for the project to dump as files";
+                  #type = attrsOf (either str (functionTo str));
+                  type = attrsOf unspecified;
+                  description = "Secrets for the project to dump as files. Might be a function that takes pkgs as argument";
                 };
                 environment = mkOption {
-                  type = attrsOf str;
+                  #type = attrsOf (either str (functionTo str));
+                  type = attrsOf unspecified;
                   description = ''
-                    Environment variables for the project.
+                    Environment variables for the project. Might be a function that takes pkgs as argument.
                     BUILDBOT_ is prefixed to the variable names
                   '';
                 };
@@ -1245,6 +1247,23 @@ in
       description = "Websites configurations";
       type = submodule {
         options = {
+          christophe_carpentier = mkOption {
+            description = "Christophe Carpentier configuration by environment";
+            type = submodule {
+              options = {
+                agorakit = mkOption {
+                  description = "Agorakit configuration";
+                  type = submodule {
+                    options = {
+                      mysql = mkMysqlOptions "Agorakit" {};
+                      smtp = mkSmtpOptions "Agorakit";
+                      appkey = mkOption { type = str; description = "App key"; };
+                    };
+                  };
+                };
+              };
+            };
+          };
           immae = mkOption {
             description = "Immae configuration by environment";
             type = submodule {
@@ -1313,6 +1332,16 @@ in
                   options = {
                     production = chloeSubmodule;
                     integration = chloeSubmodule;
+                    new = mkOption {
+                      description = "environment configuration";
+                      type = submodule {
+                        options = {
+                          mysql = mkMysqlOptions "ChloeNew" {};
+                          ldap = mkLdapOptions "ChloeNew" {};
+                          secret = mkOption { type = str; description = "Symfony App secret"; };
+                        };
+                      };
+                    };
                   };
                 };
           };
@@ -1390,6 +1419,7 @@ in
                   admin_password = mkOption { type = str; description = "Admin password"; };
                 };
                 gestion-compte = {
+                  smtp = mkSmtpOptions "GestionCompte";
                   mysql = mkMysqlOptions "gestion-compte" {};
                   secret = mkOption { type = str; description = "Application secret"; };
                   adminpassword = mkOption { type = str; description = "Admin password"; };
@@ -1400,6 +1430,10 @@ in
                   secret = mkOption { type = str; description = "Application secret"; };
                   adminpassword = mkOption { type = str; description = "Admin password"; };
                 };
+                copanier = {
+                  smtp = mkSmtpOptions "Copanier";
+                  staff = mkOption { type = listOf str; description = "List of staff members"; };
+                };
               };
             };
           };