diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-22 12:49:20 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-22 12:49:20 +0100 |
commit | 9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d (patch) | |
tree | 0b011ca0aeeef02dce03a3c825d9a037c5cfc01a /virtual/modules/websites/connexionswing | |
parent | 0f3047a77ee1e0b3d943e39d50301ba85821c572 (diff) | |
download | Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.tar.gz Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.tar.zst Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.zip |
Remove use of environment variables
Fixes https://git.immae.eu/mantisbt/view.php?id=113
Diffstat (limited to 'virtual/modules/websites/connexionswing')
-rw-r--r-- | virtual/modules/websites/connexionswing/connexionswing.nix | 20 | ||||
-rw-r--r-- | virtual/modules/websites/connexionswing/default.nix | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/virtual/modules/websites/connexionswing/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix index 71f3c0b..66c9b53 100644 --- a/virtual/modules/websites/connexionswing/connexionswing.nix +++ b/virtual/modules/websites/connexionswing/connexionswing.nix | |||
@@ -1,29 +1,25 @@ | |||
1 | { lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert }: | 1 | { lib, writeText, fetchedGitPrivate, stdenv, php, git, cacert }: |
2 | let | 2 | let |
3 | connexionswing = { environment ? "dev" }: rec { | 3 | connexionswing = { config }: rec { |
4 | environment = config.environment; | ||
4 | varDir = "/var/lib/connexionswing_${environment}"; | 5 | varDir = "/var/lib/connexionswing_${environment}"; |
5 | envName= lib.strings.toUpper environment; | 6 | envName= lib.strings.toUpper environment; |
6 | configRoot = | 7 | configRoot = |
7 | assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_PASSWORD"; | ||
8 | assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_USER"; | ||
9 | assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_NAME"; | ||
10 | assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_SECRET"; | ||
11 | assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_EMAIL"; | ||
12 | writeText "parameters.yml" '' | 8 | writeText "parameters.yml" '' |
13 | # This file is auto-generated during the composer install | 9 | # This file is auto-generated during the composer install |
14 | parameters: | 10 | parameters: |
15 | database_host: db-1.immae.eu | 11 | database_host: db-1.immae.eu |
16 | database_port: null | 12 | database_port: null |
17 | database_name: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_NAME"} | 13 | database_name: ${config.mysql.name} |
18 | database_user: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_USER"} | 14 | database_user: ${config.mysql.user} |
19 | database_password: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_PASSWORD"} | 15 | database_password: ${config.mysql.password} |
20 | mailer_transport: smtp | 16 | mailer_transport: smtp |
21 | mailer_host: mail.immae.eu | 17 | mailer_host: mail.immae.eu |
22 | mailer_user: null | 18 | mailer_user: null |
23 | mailer_password: null | 19 | mailer_password: null |
24 | subscription_email: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_EMAIL"} | 20 | subscription_email: ${config.email} |
25 | allow_robots: true | 21 | allow_robots: true |
26 | secret: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_SECRET"} | 22 | secret: ${config.secret} |
27 | ''; | 23 | ''; |
28 | phpFpm = rec { | 24 | phpFpm = rec { |
29 | socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; | 25 | socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; |
diff --git a/virtual/modules/websites/connexionswing/default.nix b/virtual/modules/websites/connexionswing/default.nix index 5667c91..2e4dfc7 100644 --- a/virtual/modules/websites/connexionswing/default.nix +++ b/virtual/modules/websites/connexionswing/default.nix | |||
@@ -1,8 +1,12 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, mylibs, myconfig, ... }: |
2 | let | 2 | let |
3 | connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) checkEnv fetchedGitPrivate; }; | 3 | connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) fetchedGitPrivate; }; |
4 | connexionswing_dev = connexionswing { environment = "dev"; }; | 4 | connexionswing_dev = connexionswing { |
5 | connexionswing_prod = connexionswing { environment = "prod"; }; | 5 | config = myconfig.env.websites.connexionswing.integration; |
6 | }; | ||
7 | connexionswing_prod = connexionswing { | ||
8 | config = myconfig.env.websites.connexionswing.production; | ||
9 | }; | ||
6 | 10 | ||
7 | cfg = config.services.myWebsites.Connexionswing; | 11 | cfg = config.services.myWebsites.Connexionswing; |
8 | in { | 12 | in { |