X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Faten.nix;h=897b3ba4146d385b3d4de4987f0a1cb483c937af;hp=d9286c3fa7bd402ccfadd2f6e0d3d9100cfaf5c1;hb=a754e9dbf5d6c35398f3c4ec52c3daf5f8ed2dd3;hpb=dfb0e6df5ca2e045b45f2dce0a254b7444fb277f diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix index d9286c3..897b3ba 100644 --- a/nixops/modules/websites/aten/aten.nix +++ b/nixops/modules/websites/aten/aten.nix @@ -29,6 +29,17 @@ let pm.max_spare_servers = 3 ''}''; }; + keys."${environment}-aten" = { + destDir = "/run/keys/webapps"; + user = apache.user; + group = apache.group; + permissions = "0700"; + text = '' + SetEnv APP_ENV "${environment}" + SetEnv APP_SECRET "${config.secret}" + SetEnv DATABASE_URL "${config.psql_url}" + ''; + }; apache = rec { user = "wwwrun"; group = "wwwrun"; @@ -40,9 +51,7 @@ let SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" - SetEnv APP_ENV "${environment}" - SetEnv APP_SECRET "${config.secret}" - SetEnv DATABASE_URL "${config.psql_url}" + Include /run/keys/webapps/${environment}-aten ${if environment == "dev" then '' @@ -124,8 +133,6 @@ let preInstall = '' export SYMFONY_ENV="${environment}" export APP_ENV="${environment}" - export DATABASE_URL="${config.psql_url}" - export APP_SECRET="${config.secret}" ''; postInstall = '' ln -sf ${yarnModules}/node_modules .