Fix secret permissions

[perso/Immae/Config/Nix.git] / nixops / modules / websites / piedsjaloux / piedsjaloux.nix
diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix

index 1b53c4a5022e0531ca3cf2591512aa869d2b53c7..1c7e983f72eaa6679d4e10c4d1bd91dd7cb8189d 100644 (file)
--- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
+++ b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
@@ -3,18 +3,22 @@ let
    piedsjaloux = { config }: rec {
      environment = config.environment;
      varDir = "/var/lib/piedsjaloux_${environment}";
-    configRoot =
-      writeText "parameters.yml" ''
+    keys."${environment}-piedsjaloux" = {
+      destDir = "/run/keys/webapps";
+      user = apache.user;
+      group = apache.group;
+      permissions = "0400";
+      text = ''
          # This file is auto-generated during the composer install
          parameters:
-            database_host: db-1.immae.eu
-            database_port: null
+            database_host: ${config.mysql.host}
+            database_port: ${config.mysql.port}
              database_name: ${config.mysql.name}
              database_user: ${config.mysql.user}
              database_password: ${config.mysql.password}
              database_server_version: ${pkgs.mariadb.mysqlVersion}
              mailer_transport: smtp
-            mailer_host: mail.immae.eu
+            mailer_host: 127.0.0.1
              mailer_user: null
              mailer_password: null
              secret: ${config.secret}
@@ -22,7 +26,9 @@ let
          leapt_im:
              binary_path: ${imagemagick}/bin
        '';
+    };
      phpFpm = rec {
+      serviceDeps = [ "mysql.service" "${environment}-piedsjaloux-key.service" ];
        socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock";
        pool = ''
          listen = ${socket}
@@ -33,8 +39,9 @@ let
          php_admin_value[upload_max_filesize] = 20M
          php_admin_value[post_max_size] = 20M
          ;php_admin_flag[log_errors] = on
-        php_admin_value[open_basedir] = "${configRoot}:${webappDir}:${varDir}:/tmp"
+        php_admin_value[open_basedir] = "/run/keys/webapps/${environment}-piedsjaloux:${webappDir}:${varDir}:/tmp"
          php_admin_value[session.save_path] = "${varDir}/phpSessions"
+        env[PATH] = ${lib.makeBinPath [ pkgs.apg pkgs.unzip ]}
          ${if environment == "dev" then ''
          pm = ondemand
          pm.max_children = 5
@@ -48,10 +55,12 @@ let
          pm.max_spare_servers = 3
          ''}'';
      };
-    apache = {
+    apache = rec {
        user = "wwwrun";
        group = "wwwrun";
        modules = [ "proxy_fcgi" ];
+      webappName = "piedsjaloux_${environment}";
+      root = "/run/current-system/webapps/${webappName}";
        vhostConf = ''
        <FilesMatch "\.php$">
          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
@@ -64,7 +73,7 @@ let
          ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://piedsjaloux.fr\"></html>"
        </Location>
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride None
          Require all granted
@@ -107,7 +116,7 @@ let
        '' else ''
        Use Stats piedsjaloux.fr
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride All
          Require all granted
@@ -143,9 +152,9 @@ let
          postInstall = ''
            cd $out
            rm app/config/parameters.yml
-          ln -sf ${configRoot} app/config/parameters.yml
+          ln -sf /run/keys/webapps/${environment}-piedsjaloux app/config/parameters.yml
            rm -rf var/{logs,cache,data,miniatures,tmp}
-          ln -sf ../../../../../../../${varDir}/{logs,cache,data,miniatures,tmp} var/
+          ln -sf ${varDir}/{logs,cache,data,miniatures,tmp} var/
            '';
        });
      webRoot = "${webappDir}/web";