From 87a8bffd2dd9fc0cab3ede58d39c6fe963969ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 6 Jan 2020 15:35:37 +0100
Subject: Add relay hosts for specific senders

---
 modules/private/environment.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'modules/private/environment.nix')

diff --git a/modules/private/environment.nix b/modules/private/environment.nix
index 550b060..5f5f6c8 100644
--- a/modules/private/environment.nix
+++ b/modules/private/environment.nix
@@ -40,14 +40,14 @@ let
       };
     };
   };
-  mkMysqlOptions = name: mkOption {
+  mkMysqlOptions = name: more: mkOption {
     description = "${name} mysql configuration";
     type = submodule {
       options = mysqlOptions // {
         database = mkOption { description = "${name} database"; type = str; };
         user = mkOption { description = "${name} user"; type = str; };
         password = mkOption { description = "mysql password of the ${name} user"; type = str; };
-      };
+      } // more;
     };
   };
   psqlOptions = {
@@ -533,7 +533,9 @@ in
                   '';
                   type = listOf str;
                 };
-                mysql = mkMysqlOptions "Postfix";
+                mysql = mkMysqlOptions "Postfix" {
+                  password_encrypt = mkOption { type = str; description = "Key to encrypt relay password in database"; };
+                };
                 backup_domains = mkOption {
                   description = ''
                     Domains that are accepted for relay as backup domain
@@ -954,7 +956,7 @@ in
             description = "Yourls configuration";
             type = submodule {
               options = {
-                mysql = mkMysqlOptions "Yourls";
+                mysql = mkMysqlOptions "Yourls" {};
                 ldap = mkLdapOptions "Yourls" {};
                 cookieKey = mkOption { type = str; description = "Cookie key"; };
               };
@@ -998,7 +1000,7 @@ in
                   type = submodule {
                     options = {
                       environment = mkOption { type = str; description = "Symfony environment"; };
-                      mysql = mkMysqlOptions "Chloe";
+                      mysql = mkMysqlOptions "Chloe" {};
                       ldap = mkLdapOptions "Chloe" {};
                     };
                   };
@@ -1020,7 +1022,7 @@ in
                   type = submodule {
                     options = {
                       environment = mkOption { type = str; description = "Symfony environment"; };
-                      mysql = mkMysqlOptions "Connexionswing";
+                      mysql = mkMysqlOptions "Connexionswing" {};
                       secret = mkOption { type = str; description = "Symfony App secret"; };
                       email = mkOption { type = str; description = "Symfony email notification"; };
                     };
@@ -1038,7 +1040,7 @@ in
             description = "Naturaloutil configuration";
             type = submodule {
               options = {
-                mysql = mkMysqlOptions "Naturaloutil";
+                mysql = mkMysqlOptions "Naturaloutil" {};
                 server_admin = mkOption { type = str; description = "Server admin e-mail"; };
               };
             };
@@ -1060,7 +1062,7 @@ in
                   type = submodule {
                     options = {
                       environment = mkOption { type = str; description = "Symfony environment"; };
-                      mysql = mkMysqlOptions "LudivineCassal";
+                      mysql = mkMysqlOptions "LudivineCassal" {};
                       ldap = mkLdapOptions "LudivineCassal" {};
                       secret = mkOption { type = str; description = "Symfony App secret"; };
                     };
@@ -1107,7 +1109,7 @@ in
                   type = submodule {
                     options = {
                       environment = mkOption { type = str; description = "Symfony environment"; };
-                      mysql = mkMysqlOptions "Piedsjaloux";
+                      mysql = mkMysqlOptions "Piedsjaloux" {};
                       secret = mkOption { type = str; description = "Symfony App secret"; };
                     };
                   };
@@ -1124,7 +1126,7 @@ in
             description = "Europe Richie configurations by environment";
             type = submodule {
               options = {
-                mysql = mkMysqlOptions "Richie";
+                mysql = mkMysqlOptions "Richie" {};
                 smtp_mailer = mkOption {
                   description = "SMTP mailer configuration";
                   type = submodule {
@@ -1146,7 +1148,7 @@ in
                   type = submodule {
                     options = {
                       environment = mkOption { type = str; description = "Symfony environment"; };
-                      mysql = mkMysqlOptions "Tellesflorian";
+                      mysql = mkMysqlOptions "Tellesflorian" {};
                       secret = mkOption { type = str; description = "Symfony App secret"; };
                       invite_passwords = mkOption { type = str; description = "Password basic auth"; };
                     };
-- 
cgit v1.2.3