X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Ftellesflorian.nix;h=afd723c0936f8b0c388b1f72f634c2a760bd791c;hb=1b3154e40a568a296c74759d68827366b5f26da9;hp=ba46c0c99c67f9167d4ab4cc876a89e19215ad3c;hpb=ca330baa14da56456ec538b232a91e1c443241bb;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix index ba46c0c..afd723c 100644 --- a/nixops/modules/websites/tellesflorian/tellesflorian.nix +++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix @@ -3,14 +3,24 @@ let tellesflorian = { config }: rec { environment = config.environment; varDir = "/var/lib/tellesflorian_${environment}"; - keys."${environment}-tellesflorian" = { - destDir = "/run/keys/webapps"; - user = apache.user; - group = apache.group; - permissions = "0400"; - text = '' - # This file is auto-generated during the composer install - parameters: + keys = [ + { + dest = "webapps/${environment}-tellesflorian-passwords"; + user = apache.user; + group = apache.group; + permissions = "0400"; + text = '' + invite:${config.invite_passwords} + ''; + } + { + dest = "webapps/${environment}-tellesflorian"; + user = apache.user; + group = apache.group; + permissions = "0400"; + text = '' + # This file is auto-generated during the composer install + parameters: database_host: ${config.mysql.host} database_port: ${config.mysql.port} database_name: ${config.mysql.name} @@ -21,8 +31,9 @@ let mailer_user: null mailer_password: null secret: ${config.secret} - ''; - }; + ''; + } + ]; phpFpm = rec { preStart = '' if [ ! -f "${varDir}/currentWebappDir" -o \ @@ -33,14 +44,10 @@ let /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=${environment} cache:clear --no-warmup popd > /dev/null echo -n "${webappDir}" > ${varDir}/currentWebappDir - sha512sum /run/keys/webapps/${environment}-tellesflorian > ${varDir}/currentKey + sha512sum /var/secrets/webapps/${environment}-tellesflorian > ${varDir}/currentKey fi ''; - serviceDeps = [ - "mysql.service" - "${environment}-tellesflorian-passwords-key.service" - "${environment}-tellesflorian-key.service" - ]; + serviceDeps = [ "mysql.service" ]; socket = "/var/run/phpfpm/floriantelles-${environment}.sock"; pool = '' listen = ${socket} @@ -51,7 +58,7 @@ 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] = "/run/keys/webapps/${environment}-tellesflorian:${webappDir}:${varDir}:/tmp" + php_admin_value[open_basedir] = "/var/secrets/webapps/${environment}-tellesflorian:${webappDir}:${varDir}:/tmp" php_admin_value[session.save_path] = "${varDir}/phpSessions" ${if environment == "dev" then '' pm = ondemand @@ -66,15 +73,6 @@ let pm.max_spare_servers = 3 ''}''; }; - keys."${environment}-tellesflorian-passwords" = { - destDir = "/run/keys/webapps"; - user = apache.user; - group = apache.group; - permissions = "0400"; - text = '' - invite:${config.invite_passwords} - ''; - }; apache = rec { user = "wwwrun"; group = "wwwrun"; @@ -92,7 +90,7 @@ let Use LDAPConnect Require ldap-group cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu - AuthUserFile "/run/keys/webapps/${environment}-tellesflorian-passwords" + AuthUserFile "/var/secrets/webapps/${environment}-tellesflorian-passwords" Require user "invite" ErrorDocument 401 "" @@ -166,7 +164,7 @@ let postInstall = '' cd $out rm app/config/parameters.yml - ln -sf /run/keys/webapps/${environment}-tellesflorian app/config/parameters.yml + ln -sf /var/secrets/webapps/${environment}-tellesflorian app/config/parameters.yml rm -rf var/{logs,cache} ln -sf ${varDir}/var/{logs,cache,sessions} var/ '';