aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/connexionswing
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/connexionswing
parent60dbbd12253f2f7b6994fea1c56fdf3818d0a025 (diff)
downloadNix-a0c845b436329624ad33432a701658dc1b52cca6.tar.gz
Nix-a0c845b436329624ad33432a701658dc1b52cca6.tar.zst
Nix-a0c845b436329624ad33432a701658dc1b52cca6.zip
Add missing service dependencies
Diffstat (limited to 'nixops/modules/websites/connexionswing')
-rw-r--r--nixops/modules/websites/connexionswing/connexionswing.nix1
-rw-r--r--nixops/modules/websites/connexionswing/default.nix2
2 files changed, 3 insertions, 0 deletions
diff --git a/nixops/modules/websites/connexionswing/connexionswing.nix b/nixops/modules/websites/connexionswing/connexionswing.nix
index c178184..7bc1d51 100644
--- a/nixops/modules/websites/connexionswing/connexionswing.nix
+++ b/nixops/modules/websites/connexionswing/connexionswing.nix
@@ -33,6 +33,7 @@ let
33 ''; 33 '';
34 }; 34 };
35 phpFpm = rec { 35 phpFpm = rec {
36 serviceDeps = [ "mysql.service" "${environment}-connexionswing-key.service" ];
36 socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; 37 socket = "/var/run/phpfpm/connexionswing-${environment}.sock";
37 phpConfig = '' 38 phpConfig = ''
38 extension=${phpPackages.imagick}/lib/php/extensions/imagick.so 39 extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index 752382f..9c74f02 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -43,6 +43,7 @@ in {
43 }; 43 };
44 }; 44 };
45 45
46 services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing_prod.phpFpm.serviceDeps;
46 services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; 47 services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
47 services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; 48 services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig;
48 system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; 49 system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
@@ -62,6 +63,7 @@ in {
62 deployment.keys = connexionswing_dev.keys; 63 deployment.keys = connexionswing_dev.keys;
63 security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null; 64 security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
64 security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null; 65 security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
66 services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing_dev.phpFpm.serviceDeps;
65 services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; 67 services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
66 services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; 68 services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig;
67 system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; 69 system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;