X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Ftellesflorian.nix;h=e42158199b003008bae19b774ef445add7c0e8cd;hb=a754e9dbf5d6c35398f3c4ec52c3daf5f8ed2dd3;hp=028a235adef9115392b801bcdfcbf979e481d3e8;hpb=c9af72bccc8324af25dde5704867fad0f56418bb;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix index 028a235..e421581 100644 --- a/nixops/modules/websites/tellesflorian/tellesflorian.nix +++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix @@ -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";