aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/ludivine
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-16 01:09:08 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-16 01:43:19 +0200
commita0c845b436329624ad33432a701658dc1b52cca6 (patch)
treec19c92631da30a45080649a2e44e365500b15209 /nixops/modules/websites/ludivine
parent60dbbd12253f2f7b6994fea1c56fdf3818d0a025 (diff)
downloadNix-a0c845b436329624ad33432a701658dc1b52cca6.tar.gz
Nix-a0c845b436329624ad33432a701658dc1b52cca6.tar.zst
Nix-a0c845b436329624ad33432a701658dc1b52cca6.zip
Add missing service dependencies
Diffstat (limited to 'nixops/modules/websites/ludivine')
-rw-r--r--nixops/modules/websites/ludivine/default.nix2
-rw-r--r--nixops/modules/websites/ludivine/ludivinecassal.nix1
2 files changed, 3 insertions, 0 deletions
diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index 220f5c2..c5a904b 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -37,6 +37,7 @@ in {
37 }; 37 };
38 }; 38 };
39 39
40 services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps;
40 services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool; 41 services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
41 system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript; 42 system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
42 system.extraSystemBuilderCmds = '' 43 system.extraSystemBuilderCmds = ''
@@ -55,6 +56,7 @@ in {
55 deployment.keys = ludivinecassal_dev.keys; 56 deployment.keys = ludivinecassal_dev.keys;
56 security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null; 57 security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
57 58
59 services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps;
58 services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool; 60 services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
59 system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript; 61 system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
60 system.extraSystemBuilderCmds = '' 62 system.extraSystemBuilderCmds = ''
diff --git a/nixops/modules/websites/ludivine/ludivinecassal.nix b/nixops/modules/websites/ludivine/ludivinecassal.nix
index 244b05e..b5450e6 100644
--- a/nixops/modules/websites/ludivine/ludivinecassal.nix
+++ b/nixops/modules/websites/ludivine/ludivinecassal.nix
@@ -40,6 +40,7 @@ let
40 ''; 40 '';
41 }; 41 };
42 phpFpm = rec { 42 phpFpm = rec {
43 serviceDeps = [ "mysql.service" "${environment}-ludivinecassal-key.service" ];
43 socket = "/var/run/phpfpm/ludivinecassal-${environment}.sock"; 44 socket = "/var/run/phpfpm/ludivinecassal-${environment}.sock";
44 pool = '' 45 pool = ''
45 listen = ${socket} 46 listen = ${socket}