Upgrade nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / florian / app.nix

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 5ce073a1c23320a8091ab88a508ae76851547f53..c65c26f12d16a7836db13af5e8f15534b706a4ac 100644 (file)
--- 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;
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
+  secrets = config.myEnv.websites.tellesflorian.integration;
   app = pkgs.webapps.tellesflorian.override { environment = secrets.environment; };
   cfg = config.myServices.websites.florian.app;
   pcfg = config.services.phpApplication;
@@ -9,6 +9,7 @@ in {
   options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration";
 
   config = lib.mkIf cfg.enable {
+    services.duplyBackup.profiles.tellesflorian_dev.rootDir = app.varDir;
     services.phpApplication.apps.florian_dev = {
       websiteEnv = "integration";
       httpdUser = config.services.httpd.Inte.user;
@@ -23,15 +24,17 @@ in {
         "./bin/console --env=${app.environment} cache:clear --no-warmup"
       ];
       phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
-        php_admin_value[upload_max_filesize] = 20M
-        php_admin_value[post_max_size] = 20M
-        ;php_admin_flag[log_errors] = on
-        pm = ondemand
-        pm.max_children = 5
-        pm.process_idle_timeout = 60
-        env[SYMFONY_DEBUG_MODE] = "yes"
-      '';
+      phpPool = {
+        "php_admin_value[upload_max_filesize]" = "20M";
+        "php_admin_value[post_max_size]" = "20M";
+        #"php_admin_flag[log_errors]" = "on";
+        "pm" = "ondemand";
+        "pm.max_children" = "5";
+        "pm.process_idle_timeout" = "60";
+      };
+      phpEnv = {
+        SYMFONY_DEBUG_MODE = "yes";
+      };
       phpWatchFiles = [
         config.secrets.fullPaths."webapps/${app.environment}-tellesflorian"
       ];
@@ -41,7 +44,7 @@ in {
       {
         dest = "webapps/${app.environment}-tellesflorian-passwords";
         user = config.services.httpd.Inte.user;
-        group = config.services.httpd.Inte.user;
+        group = config.services.httpd.Inte.group;
         permissions = "0400";
         text = ''
           invite:${secrets.invite_passwords}
@@ -50,14 +53,14 @@ in {
       {
         dest = "webapps/${app.environment}-tellesflorian";
         user = config.services.httpd.Inte.user;
-        group = config.services.httpd.Inte.user;
+        group = config.services.httpd.Inte.group;
         permissions = "0400";
         text = ''
           # This file is auto-generated during the composer install
           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
@@ -71,7 +74,7 @@ in {
 
     services.websites.env.integration.modules = adminer.apache.modules;
     services.websites.env.integration.vhostConfs.florian_dev = {
-      certName     = "eldiron";
+      certName     = "integration";
       addToCerts  = true;
       hosts       = [ "app.tellesflorian.com" ];
       root        = pcfg.webappDirs.florian_dev;
@@ -133,7 +136,7 @@ in {
 
         </Directory>
         ''
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
       ];
     };
   };