Make goaccess a template

[perso/Immae/Config/Nix.git] / nixops / modules / websites / ftp / jerome.nix

diff --git a/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix
index 218060f3f58fc30e35b4800948da17d0586b6df8..e04d6408ebe6ce448cca25d86918f24514b81a1f 100644 (file)
--- a/nixops/modules/websites/ftp/jerome.nix
+++ b/nixops/modules/websites/ftp/jerome.nix
@@ -18,10 +18,7 @@ in {
   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;
-      }
+      { name = "naturaloutil.immae.eu"; }
     ];
 
     security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
@@ -29,10 +26,11 @@ in {
       domain = "naturaloutil.immae.eu";
     };
 
-    deployment.keys."prod-naturaloutil" = {
-      destDir = "/run/keys/webapps";
+    secrets.keys = [{
+      dest = "webapps/prod-naturaloutil";
       user = "wwwrun";
       group = "wwwrun";
+      permissions = "0400";
       text = ''
         <?php
         $mysql_user = '${env.mysql.user}' ;
@@ -48,8 +46,8 @@ in {
         $database = connect_db($db, $mysql_server, $mysql_base, $mysql_user, $mysql_password);
         ?>
       '';
-    };
-    services.myPhpfpm.serviceDependencies.jerome = [ "mysql.service" "prod-naturaloutil-key.service" ];
+    }];
+    services.myPhpfpm.serviceDependencies.jerome = [ "mysql.service" ];
     services.myPhpfpm.poolConfigs.jerome = ''
       listen = /run/phpfpm/naturaloutil.sock
       user = wwwrun
@@ -61,8 +59,8 @@ in {
       pm.max_children = 5
       pm.process_idle_timeout = 60
 
-      env[BDD_CONNECT] = "/run/keys/webapps/prod-naturaloutil"
-      php_admin_value[open_basedir] = "/run/keys/webapps/prod-naturaloutil:${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