X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fpiedsjaloux%2Fpiedsjaloux.nix;h=1c7e983f72eaa6679d4e10c4d1bd91dd7cb8189d;hb=85f5ed68104de9edd8f8e532dc0c2de931e3ca1b;hp=52838c69f93ccae2126b069caf38432d79b0fceb;hpb=7ebcaad53a3261d8a4aefd8a64c5c7d9d8ac2fa0;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix index 52838c6..1c7e983 100644 --- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix +++ b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix @@ -3,8 +3,12 @@ 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: ${config.mysql.host} @@ -14,7 +18,7 @@ let 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 = '' SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" @@ -64,7 +73,7 @@ let ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted @@ -107,7 +116,7 @@ let '' else '' Use Stats piedsjaloux.fr - + 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";