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/tellesflorian | |
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/tellesflorian')
-rw-r--r-- | virtual/modules/websites/tellesflorian/default.nix | 8 | ||||
-rw-r--r-- | virtual/modules/websites/tellesflorian/tellesflorian.nix | 25 |
2 files changed, 14 insertions, 19 deletions
diff --git a/virtual/modules/websites/tellesflorian/default.nix b/virtual/modules/websites/tellesflorian/default.nix index 8f8c35a..f347169 100644 --- a/virtual/modules/websites/tellesflorian/default.nix +++ b/virtual/modules/websites/tellesflorian/default.nix | |||
@@ -1,9 +1,11 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; | 3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; |
4 | 4 | ||
5 | tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) checkEnv fetchedGitPrivate; }; | 5 | tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; }; |
6 | tellesflorian_dev = tellesflorian { environment = "dev"; }; | 6 | tellesflorian_dev = tellesflorian { |
7 | config = myconfig.env.websites.tellesflorian.integration; | ||
8 | }; | ||
7 | 9 | ||
8 | cfg = config.services.myWebsites.TellesFlorian; | 10 | cfg = config.services.myWebsites.TellesFlorian; |
9 | in { | 11 | in { |
diff --git a/virtual/modules/websites/tellesflorian/tellesflorian.nix b/virtual/modules/websites/tellesflorian/tellesflorian.nix index 2191b31..03b1faf 100644 --- a/virtual/modules/websites/tellesflorian/tellesflorian.nix +++ b/virtual/modules/websites/tellesflorian/tellesflorian.nix | |||
@@ -1,27 +1,22 @@ | |||
1 | { lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages }: | 1 | { lib, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages }: |
2 | let | 2 | let |
3 | tellesflorian = { environment ? "dev" }: rec { | 3 | tellesflorian = { config }: rec { |
4 | varPrefix = "TELLESFLORIAN"; | 4 | environment = config.environment; |
5 | varDir = "/var/lib/tellesflorian_${environment}"; | 5 | varDir = "/var/lib/tellesflorian_${environment}"; |
6 | envName= lib.strings.toUpper environment; | ||
7 | configRoot = | 6 | configRoot = |
8 | assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD"; | ||
9 | assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER"; | ||
10 | assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME"; | ||
11 | assert checkEnv "NIXOPS_${varPrefix}_${envName}_SECRET"; | ||
12 | writeText "parameters.yml" '' | 7 | writeText "parameters.yml" '' |
13 | # This file is auto-generated during the composer install | 8 | # This file is auto-generated during the composer install |
14 | parameters: | 9 | parameters: |
15 | database_host: db-1.immae.eu | 10 | database_host: db-1.immae.eu |
16 | database_port: null | 11 | database_port: null |
17 | database_name: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME"} | 12 | database_name: ${config.mysql.name} |
18 | database_user: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER"} | 13 | database_user: ${config.mysql.user} |
19 | database_password: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD"} | 14 | database_password: ${config.mysql.password} |
20 | mailer_transport: smtp | 15 | mailer_transport: smtp |
21 | mailer_host: mail.immae.eu | 16 | mailer_host: mail.immae.eu |
22 | mailer_user: null | 17 | mailer_user: null |
23 | mailer_password: null | 18 | mailer_password: null |
24 | secret: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_SECRET"} | 19 | secret: ${config.secret} |
25 | ''; | 20 | ''; |
26 | phpFpm = rec { | 21 | phpFpm = rec { |
27 | socket = "/var/run/phpfpm/floriantelles-${environment}.sock"; | 22 | socket = "/var/run/phpfpm/floriantelles-${environment}.sock"; |
@@ -49,10 +44,8 @@ let | |||
49 | pm.max_spare_servers = 3 | 44 | pm.max_spare_servers = 3 |
50 | ''}''; | 45 | ''}''; |
51 | }; | 46 | }; |
52 | passwords = | 47 | passwords = writeText "tellesflorian_passwords" '' |
53 | assert checkEnv "NIXOPS_${varPrefix}_${envName}_INVITE_PASSWORDS"; | 48 | invite:${config.invite_passwords} |
54 | writeText "tellesflorian_passwords" '' | ||
55 | invite:${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_INVITE_PASSWORDS"} | ||
56 | ''; | 49 | ''; |
57 | apache = { | 50 | apache = { |
58 | user = "wwwrun"; | 51 | user = "wwwrun"; |