diff options
Diffstat (limited to 'modules/private/environment.nix')
-rw-r--r-- | modules/private/environment.nix | 24 |
1 files changed, 13 insertions, 11 deletions
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 | |||
40 | }; | 40 | }; |
41 | }; | 41 | }; |
42 | }; | 42 | }; |
43 | mkMysqlOptions = name: mkOption { | 43 | mkMysqlOptions = name: more: mkOption { |
44 | description = "${name} mysql configuration"; | 44 | description = "${name} mysql configuration"; |
45 | type = submodule { | 45 | type = submodule { |
46 | options = mysqlOptions // { | 46 | options = mysqlOptions // { |
47 | database = mkOption { description = "${name} database"; type = str; }; | 47 | database = mkOption { description = "${name} database"; type = str; }; |
48 | user = mkOption { description = "${name} user"; type = str; }; | 48 | user = mkOption { description = "${name} user"; type = str; }; |
49 | password = mkOption { description = "mysql password of the ${name} user"; type = str; }; | 49 | password = mkOption { description = "mysql password of the ${name} user"; type = str; }; |
50 | }; | 50 | } // more; |
51 | }; | 51 | }; |
52 | }; | 52 | }; |
53 | psqlOptions = { | 53 | psqlOptions = { |
@@ -533,7 +533,9 @@ in | |||
533 | ''; | 533 | ''; |
534 | type = listOf str; | 534 | type = listOf str; |
535 | }; | 535 | }; |
536 | mysql = mkMysqlOptions "Postfix"; | 536 | mysql = mkMysqlOptions "Postfix" { |
537 | password_encrypt = mkOption { type = str; description = "Key to encrypt relay password in database"; }; | ||
538 | }; | ||
537 | backup_domains = mkOption { | 539 | backup_domains = mkOption { |
538 | description = '' | 540 | description = '' |
539 | Domains that are accepted for relay as backup domain | 541 | Domains that are accepted for relay as backup domain |
@@ -954,7 +956,7 @@ in | |||
954 | description = "Yourls configuration"; | 956 | description = "Yourls configuration"; |
955 | type = submodule { | 957 | type = submodule { |
956 | options = { | 958 | options = { |
957 | mysql = mkMysqlOptions "Yourls"; | 959 | mysql = mkMysqlOptions "Yourls" {}; |
958 | ldap = mkLdapOptions "Yourls" {}; | 960 | ldap = mkLdapOptions "Yourls" {}; |
959 | cookieKey = mkOption { type = str; description = "Cookie key"; }; | 961 | cookieKey = mkOption { type = str; description = "Cookie key"; }; |
960 | }; | 962 | }; |
@@ -998,7 +1000,7 @@ in | |||
998 | type = submodule { | 1000 | type = submodule { |
999 | options = { | 1001 | options = { |
1000 | environment = mkOption { type = str; description = "Symfony environment"; }; | 1002 | environment = mkOption { type = str; description = "Symfony environment"; }; |
1001 | mysql = mkMysqlOptions "Chloe"; | 1003 | mysql = mkMysqlOptions "Chloe" {}; |
1002 | ldap = mkLdapOptions "Chloe" {}; | 1004 | ldap = mkLdapOptions "Chloe" {}; |
1003 | }; | 1005 | }; |
1004 | }; | 1006 | }; |
@@ -1020,7 +1022,7 @@ in | |||
1020 | type = submodule { | 1022 | type = submodule { |
1021 | options = { | 1023 | options = { |
1022 | environment = mkOption { type = str; description = "Symfony environment"; }; | 1024 | environment = mkOption { type = str; description = "Symfony environment"; }; |
1023 | mysql = mkMysqlOptions "Connexionswing"; | 1025 | mysql = mkMysqlOptions "Connexionswing" {}; |
1024 | secret = mkOption { type = str; description = "Symfony App secret"; }; | 1026 | secret = mkOption { type = str; description = "Symfony App secret"; }; |
1025 | email = mkOption { type = str; description = "Symfony email notification"; }; | 1027 | email = mkOption { type = str; description = "Symfony email notification"; }; |
1026 | }; | 1028 | }; |
@@ -1038,7 +1040,7 @@ in | |||
1038 | description = "Naturaloutil configuration"; | 1040 | description = "Naturaloutil configuration"; |
1039 | type = submodule { | 1041 | type = submodule { |
1040 | options = { | 1042 | options = { |
1041 | mysql = mkMysqlOptions "Naturaloutil"; | 1043 | mysql = mkMysqlOptions "Naturaloutil" {}; |
1042 | server_admin = mkOption { type = str; description = "Server admin e-mail"; }; | 1044 | server_admin = mkOption { type = str; description = "Server admin e-mail"; }; |
1043 | }; | 1045 | }; |
1044 | }; | 1046 | }; |
@@ -1060,7 +1062,7 @@ in | |||
1060 | type = submodule { | 1062 | type = submodule { |
1061 | options = { | 1063 | options = { |
1062 | environment = mkOption { type = str; description = "Symfony environment"; }; | 1064 | environment = mkOption { type = str; description = "Symfony environment"; }; |
1063 | mysql = mkMysqlOptions "LudivineCassal"; | 1065 | mysql = mkMysqlOptions "LudivineCassal" {}; |
1064 | ldap = mkLdapOptions "LudivineCassal" {}; | 1066 | ldap = mkLdapOptions "LudivineCassal" {}; |
1065 | secret = mkOption { type = str; description = "Symfony App secret"; }; | 1067 | secret = mkOption { type = str; description = "Symfony App secret"; }; |
1066 | }; | 1068 | }; |
@@ -1107,7 +1109,7 @@ in | |||
1107 | type = submodule { | 1109 | type = submodule { |
1108 | options = { | 1110 | options = { |
1109 | environment = mkOption { type = str; description = "Symfony environment"; }; | 1111 | environment = mkOption { type = str; description = "Symfony environment"; }; |
1110 | mysql = mkMysqlOptions "Piedsjaloux"; | 1112 | mysql = mkMysqlOptions "Piedsjaloux" {}; |
1111 | secret = mkOption { type = str; description = "Symfony App secret"; }; | 1113 | secret = mkOption { type = str; description = "Symfony App secret"; }; |
1112 | }; | 1114 | }; |
1113 | }; | 1115 | }; |
@@ -1124,7 +1126,7 @@ in | |||
1124 | description = "Europe Richie configurations by environment"; | 1126 | description = "Europe Richie configurations by environment"; |
1125 | type = submodule { | 1127 | type = submodule { |
1126 | options = { | 1128 | options = { |
1127 | mysql = mkMysqlOptions "Richie"; | 1129 | mysql = mkMysqlOptions "Richie" {}; |
1128 | smtp_mailer = mkOption { | 1130 | smtp_mailer = mkOption { |
1129 | description = "SMTP mailer configuration"; | 1131 | description = "SMTP mailer configuration"; |
1130 | type = submodule { | 1132 | type = submodule { |
@@ -1146,7 +1148,7 @@ in | |||
1146 | type = submodule { | 1148 | type = submodule { |
1147 | options = { | 1149 | options = { |
1148 | environment = mkOption { type = str; description = "Symfony environment"; }; | 1150 | environment = mkOption { type = str; description = "Symfony environment"; }; |
1149 | mysql = mkMysqlOptions "Tellesflorian"; | 1151 | mysql = mkMysqlOptions "Tellesflorian" {}; |
1150 | secret = mkOption { type = str; description = "Symfony App secret"; }; | 1152 | secret = mkOption { type = str; description = "Symfony App secret"; }; |
1151 | invite_passwords = mkOption { type = str; description = "Password basic auth"; }; | 1153 | invite_passwords = mkOption { type = str; description = "Password basic auth"; }; |
1152 | }; | 1154 | }; |