X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Ftellesflorian.nix;h=e42158199b003008bae19b774ef445add7c0e8cd;hb=3c8d7f8706433ce0f995f3bf37fdfd348fb9e173;hp=41be4b04e38c134703f10a73936a77e2a9e8919f;hpb=7ebcaad53a3261d8a4aefd8a64c5c7d9d8ac2fa0;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix index 41be4b0..e421581 100644 --- a/nixops/modules/websites/tellesflorian/tellesflorian.nix +++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix @@ -13,7 +13,7 @@ let database_user: ${config.mysql.user} database_password: ${config.mysql.password} mailer_transport: smtp - mailer_host: mail.immae.eu + mailer_host: 127.0.0.1 mailer_user: null mailer_password: null secret: ${config.secret} @@ -47,10 +47,12 @@ let passwords = writeText "tellesflorian_passwords" '' invite:${config.invite_passwords} ''; - apache = { + apache = rec { user = "wwwrun"; group = "wwwrun"; modules = [ "proxy_fcgi" ]; + webappName = "florian_${environment}"; + root = "/run/current-system/webapps/${webappName}"; vhostConf = '' SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" @@ -68,7 +70,7 @@ let ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted @@ -109,7 +111,7 @@ let '' else '' - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride All Require all granted @@ -145,7 +147,7 @@ let rm app/config/parameters.yml ln -sf ${configRoot} app/config/parameters.yml rm -rf var/{logs,cache} - ln -sf ../../../../../../${varDir}/var/{logs,cache,sessions} var/ + ln -sf ${varDir}/var/{logs,cache,sessions} var/ ''; }); webRoot = "${webappDir}/web";