diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-12-12 00:24:23 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-12-20 04:12:27 +0100 |
commit | ab8f306d7c2c49b8116e1af7b355ed2384617ed9 (patch) | |
tree | d1061ec0436fd096de2332a892eb984c63cb125e /modules/private/websites/connexionswing | |
parent | 4227853a03923e04daf3dd511a4b5a1ab5d527e7 (diff) | |
download | Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.tar.gz Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.tar.zst Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.zip |
Add specification for the private config file as a module.
Diffstat (limited to 'modules/private/websites/connexionswing')
-rw-r--r-- | modules/private/websites/connexionswing/integration.nix | 6 | ||||
-rw-r--r-- | modules/private/websites/connexionswing/production.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index 54dbf54..c0f7445 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix | |||
@@ -1,6 +1,6 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | secrets = myconfig.env.websites.connexionswing.integration; | 3 | secrets = config.myEnv.websites.connexionswing.integration; |
4 | app = pkgs.webapps.connexionswing.override { environment = secrets.environment; }; | 4 | app = pkgs.webapps.connexionswing.override { environment = secrets.environment; }; |
5 | cfg = config.myServices.websites.connexionswing.integration; | 5 | cfg = config.myServices.websites.connexionswing.integration; |
6 | pcfg = config.services.phpApplication; | 6 | pcfg = config.services.phpApplication; |
@@ -50,7 +50,7 @@ in { | |||
50 | parameters: | 50 | parameters: |
51 | database_host: ${secrets.mysql.host} | 51 | database_host: ${secrets.mysql.host} |
52 | database_port: ${secrets.mysql.port} | 52 | database_port: ${secrets.mysql.port} |
53 | database_name: ${secrets.mysql.name} | 53 | database_name: ${secrets.mysql.database} |
54 | database_user: ${secrets.mysql.user} | 54 | database_user: ${secrets.mysql.user} |
55 | database_password: ${secrets.mysql.password} | 55 | database_password: ${secrets.mysql.password} |
56 | database_server_version: ${pkgs.mariadb.mysqlVersion} | 56 | database_server_version: ${pkgs.mariadb.mysqlVersion} |
diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix index af37e29..fa31931 100644 --- a/modules/private/websites/connexionswing/production.nix +++ b/modules/private/websites/connexionswing/production.nix | |||
@@ -1,6 +1,6 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | secrets = myconfig.env.websites.connexionswing.production; | 3 | secrets = config.myEnv.websites.connexionswing.production; |
4 | app = pkgs.webapps.connexionswing.override { environment = secrets.environment; }; | 4 | app = pkgs.webapps.connexionswing.override { environment = secrets.environment; }; |
5 | cfg = config.myServices.websites.connexionswing.production; | 5 | cfg = config.myServices.websites.connexionswing.production; |
6 | pcfg = config.services.phpApplication; | 6 | pcfg = config.services.phpApplication; |
@@ -52,7 +52,7 @@ in { | |||
52 | parameters: | 52 | parameters: |
53 | database_host: ${secrets.mysql.host} | 53 | database_host: ${secrets.mysql.host} |
54 | database_port: ${secrets.mysql.port} | 54 | database_port: ${secrets.mysql.port} |
55 | database_name: ${secrets.mysql.name} | 55 | database_name: ${secrets.mysql.database} |
56 | database_user: ${secrets.mysql.user} | 56 | database_user: ${secrets.mysql.user} |
57 | database_password: ${secrets.mysql.password} | 57 | database_password: ${secrets.mysql.password} |
58 | database_server_version: ${pkgs.mariadb.mysqlVersion} | 58 | database_server_version: ${pkgs.mariadb.mysqlVersion} |