diff options
Diffstat (limited to 'nixops/modules/websites/piedsjaloux')
-rw-r--r-- | nixops/modules/websites/piedsjaloux/default.nix | 2 | ||||
-rw-r--r-- | nixops/modules/websites/piedsjaloux/piedsjaloux.nix | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix index 7552db4..57849a3 100644 --- a/nixops/modules/websites/piedsjaloux/default.nix +++ b/nixops/modules/websites/piedsjaloux/default.nix | |||
@@ -41,6 +41,7 @@ in { | |||
41 | }; | 41 | }; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux_prod.phpFpm.preStart; | ||
44 | services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps; | 45 | services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps; |
45 | services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; | 46 | services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; |
46 | system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; | 47 | system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; |
@@ -59,6 +60,7 @@ in { | |||
59 | (lib.mkIf cfg.integration.enable { | 60 | (lib.mkIf cfg.integration.enable { |
60 | deployment.keys = piedsjaloux_dev.keys; | 61 | deployment.keys = piedsjaloux_dev.keys; |
61 | security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; | 62 | security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; |
63 | services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux_dev.phpFpm.preStart; | ||
62 | services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps; | 64 | services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps; |
63 | services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; | 65 | services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; |
64 | system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; | 66 | system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; |
diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix index 1c7e983..87699db 100644 --- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix +++ b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix | |||
@@ -28,6 +28,18 @@ let | |||
28 | ''; | 28 | ''; |
29 | }; | 29 | }; |
30 | phpFpm = rec { | 30 | phpFpm = rec { |
31 | preStart = '' | ||
32 | if [ ! -f "${varDir}/currentWebappDir" -o \ | ||
33 | ! -f "${varDir}/currentKey" -o \ | ||
34 | "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ] \ | ||
35 | || ! sha512sum -c --status ${varDir}/currentKey; then | ||
36 | pushd ${webappDir} > /dev/null | ||
37 | /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=${environment} cache:clear --no-warmup | ||
38 | popd > /dev/null | ||
39 | echo -n "${webappDir}" > ${varDir}/currentWebappDir | ||
40 | sha512sum /run/keys/webapps/${environment}-piedsjaloux > ${varDir}/currentKey | ||
41 | fi | ||
42 | ''; | ||
31 | serviceDeps = [ "mysql.service" "${environment}-piedsjaloux-key.service" ]; | 43 | serviceDeps = [ "mysql.service" "${environment}-piedsjaloux-key.service" ]; |
32 | socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock"; | 44 | socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock"; |
33 | pool = '' | 45 | pool = '' |
@@ -130,13 +142,6 @@ let | |||
130 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ | 142 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ |
131 | ${varDir}/tmp | 143 | ${varDir}/tmp |
132 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions | 144 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions |
133 | if [ ! -f "${varDir}/currentWebappDir" -o \ | ||
134 | "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ]; then | ||
135 | pushd ${webappDir} > /dev/null | ||
136 | $wrapperDir/sudo -u wwwrun ./bin/console --env=${environment} cache:clear --no-warmup | ||
137 | popd > /dev/null | ||
138 | echo -n "${webappDir}" > ${varDir}/currentWebappDir | ||
139 | fi | ||
140 | ''; | 145 | ''; |
141 | }; | 146 | }; |
142 | webappDir = composerEnv.buildPackage ( | 147 | webappDir = composerEnv.buildPackage ( |