X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fjerome.nix;h=60e4dfba95ab52d43599d6a85a64cb44f2b6006e;hb=9eae2b47b7b315b05a0e010f3003bd875685e260;hp=199bfab2184295770229028c1448061905a174f8;hpb=d578d27021abba83de60143611230c692da46521;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix
index 199bfab..60e4dfb 100644
--- a/nixops/modules/websites/ftp/jerome.nix
+++ b/nixops/modules/websites/ftp/jerome.nix
@@ -11,26 +11,20 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkIf cfg.production.enable {
-    services.myWebsites.commons.stats.enable = true;
-    services.myWebsites.commons.stats.sites = [
-      {
-        name = "naturaloutil.immae.eu";
-        conf = ./jerome_goaccess.conf;
-      }
-    ];
+    services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
 
     security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
     security.acme.certs."naturaloutil" = config.services.myCertificates.certConfig // {
       domain = "naturaloutil.immae.eu";
     };
 
-    services.myPhpfpm.poolConfigs.jerome = let
-      configFile = pkgs.writeText "naturaloutil.inc.php" ''
+    secrets.keys = [{
+      dest = "webapps/prod-naturaloutil";
+      user = "wwwrun";
+      group = "wwwrun";
+      permissions = "0400";
+      text = ''
         <?php
         $mysql_user = '${env.mysql.user}' ;
         $mysql_server = '${env.mysql.host}' ;
@@ -44,8 +38,10 @@ in {
         '' else ""}
         $database = connect_db($db, $mysql_server, $mysql_base, $mysql_user, $mysql_password);
         ?>
-        '';
-      in ''
+      '';
+    }];
+    services.myPhpfpm.serviceDependencies.jerome = [ "mysql.service" ];
+    services.myPhpfpm.poolConfigs.jerome = ''
       listen = /run/phpfpm/naturaloutil.sock
       user = wwwrun
       group = wwwrun
@@ -56,8 +52,8 @@ in {
       pm.max_children = 5
       pm.process_idle_timeout = 60
 
-      env[BDD_CONNECT] = "${configFile}"
-      php_admin_value[open_basedir] = "${configFile}:${varDir}:/tmp"
+      env[BDD_CONNECT] = "/var/secrets/webapps/prod-naturaloutil"
+      php_admin_value[open_basedir] = "/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp"
       '';
     services.myPhpfpm.poolPhpConfigs.jerome = ''
       extension=${pkgs.php}/lib/php/extensions/mysqli.so