From ab8f306d7c2c49b8116e1af7b355ed2384617ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 12 Dec 2019 00:24:23 +0100
Subject: Add specification for the private config file as a module.

---
 modules/private/websites/florian/app.nix         | 6 +++---
 modules/private/websites/florian/integration.nix | 4 ++--
 modules/private/websites/florian/production.nix  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/private/websites/florian')

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index e6e16fa..4e5f7d4 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -1,7 +1,7 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
-  secrets = myconfig.env.websites.tellesflorian.integration;
+  secrets = config.myEnv.websites.tellesflorian.integration;
   app = pkgs.webapps.tellesflorian.override { environment = secrets.environment; };
   cfg = config.myServices.websites.florian.app;
   pcfg = config.services.phpApplication;
@@ -58,7 +58,7 @@ in {
           parameters:
             database_host: ${secrets.mysql.host}
             database_port: ${secrets.mysql.port}
-            database_name: ${secrets.mysql.name}
+            database_name: ${secrets.mysql.database}
             database_user: ${secrets.mysql.user}
             database_password: ${secrets.mysql.password}
             mailer_transport: smtp
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index e444e69..00de761 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -1,9 +1,9 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
     cfg = config.myServices.websites.florian.integration;
     varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+    env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 44a262e..8d3dfb0 100644
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -1,9 +1,9 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
     cfg = config.myServices.websites.florian.production;
     varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+    env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.production.enable = lib.mkEnableOption "enable Florian's website production";
 
-- 
cgit v1.2.3