From 4360f70d7a9966593d9e04043fa0a75defc094e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 1 Jun 2019 12:22:13 +0200 Subject: Add phpFpm prestart script to lib --- modules/private/websites/tools/tools/wallabag.nix | 28 +++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'modules/private/websites/tools/tools/wallabag.nix') diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix index d6e5882..ba755e4 100644 --- a/modules/private/websites/tools/tools/wallabag.nix +++ b/modules/private/websites/tools/tools/wallabag.nix @@ -1,4 +1,4 @@ -{ env, wallabag }: +{ env, wallabag, mylibs }: rec { varDir = "/var/lib/wallabag"; keys = [{ @@ -110,20 +110,18 @@ rec { ''; }; phpFpm = rec { - preStart = '' - if [ ! -f "${varDir}/currentWebappDir" -o \ - ! -f "${varDir}/currentKey" -o \ - "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ] \ - || ! sha512sum -c --status ${varDir}/currentKey; then - pushd ${webappDir} > /dev/null - /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod cache:clear - rm -rf /var/lib/wallabag/var/cache/pro_ - /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction - popd > /dev/null - echo -n "${webappDir}" > ${varDir}/currentWebappDir - sha512sum /var/secrets/webapps/tools-wallabag > ${varDir}/currentKey - fi - ''; + preStart = mylibs.phpFpmPreStart { + app = webappDir; + inherit varDir; + keyFiles = [ + "/var/secrets/webapps/tools-wallabag" + ]; + actions = [ + "/run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod cache:clear" + "rm -rf /var/lib/wallabag/var/cache/pro_" + "/run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction" + ]; + }; serviceDeps = [ "postgresql.service" "openldap.service" ]; basedir = builtins.concatStringsSep ":" [ webappDir "/var/secrets/webapps/tools-wallabag" varDir ]; socket = "/var/run/phpfpm/wallabag.sock"; -- cgit v1.2.3