X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fnaturaloutil%2Fproduction.nix;h=a276c478ef828303e01a09418d91170f6e44f1f5;hb=981fa80354fd6f00f49446777c38f77bd8a65f65;hp=f59957da12814c848bb2b1ef26ea0c5009e30d30;hpb=4288c2f2431fb782b0d512b1b3749187f2374b6a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/naturaloutil/production.nix b/modules/private/websites/naturaloutil/production.nix
index f59957d..a276c47 100644
--- a/modules/private/websites/naturaloutil/production.nix
+++ b/modules/private/websites/naturaloutil/production.nix
@@ -1,16 +1,16 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
   cfg = config.myServices.websites.naturaloutil.production;
   varDir = "/var/lib/ftp/jerome";
-  env = myconfig.env.websites.jerome;
+  env = config.myEnv.websites.jerome;
 in {
   options.myServices.websites.naturaloutil.production.enable = lib.mkEnableOption "enable Naturaloutil's website";
 
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
 
-    security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
+    security.acme2.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
 
     secrets.keys = [{
       dest = "webapps/prod-naturaloutil";
@@ -21,7 +21,7 @@ in {
         <?php
         $mysql_user = '${env.mysql.user}' ;
         $mysql_server = '${env.mysql.host}' ;
-        $mysql_base = '${env.mysql.name}' ;
+        $mysql_base = '${env.mysql.database}' ;
         $mysql_password = '${env.mysql.password}' ;
         //connect to db
         $db = mysqli_init();
@@ -61,8 +61,8 @@ in {
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
     };
-    services.websites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
-    services.websites.production.vhostConfs.naturaloutil = {
+    services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
+    services.websites.env.production.vhostConfs.naturaloutil = {
       certName     = "naturaloutil";
       certMainHost = "naturaloutil.immae.eu";
       hosts        = ["naturaloutil.immae.eu" ];