aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules
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
parent60dbbd12253f2f7b6994fea1c56fdf3818d0a025 (diff)
downloadNix-a0c845b436329624ad33432a701658dc1b52cca6.tar.gz
Nix-a0c845b436329624ad33432a701658dc1b52cca6.tar.zst
Nix-a0c845b436329624ad33432a701658dc1b52cca6.zip
Add missing service dependencies
Diffstat (limited to 'nixops/modules')
-rw-r--r--nixops/modules/websites/aten/aten.nix1
-rw-r--r--nixops/modules/websites/aten/default.nix2
-rw-r--r--nixops/modules/websites/connexionswing/connexionswing.nix1
-rw-r--r--nixops/modules/websites/connexionswing/default.nix2
-rw-r--r--nixops/modules/websites/ludivine/default.nix2
-rw-r--r--nixops/modules/websites/ludivine/ludivinecassal.nix1
-rw-r--r--nixops/modules/websites/piedsjaloux/default.nix2
-rw-r--r--nixops/modules/websites/piedsjaloux/piedsjaloux.nix1
-rw-r--r--nixops/modules/websites/tellesflorian/default.nix1
-rw-r--r--nixops/modules/websites/tellesflorian/tellesflorian.nix5
10 files changed, 18 insertions, 0 deletions
diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index 897b3ba..ac102c9 100644
--- a/nixops/modules/websites/aten/aten.nix
+++ b/nixops/modules/websites/aten/aten.nix
@@ -4,6 +4,7 @@ let
4 environment = config.environment; 4 environment = config.environment;
5 varDir = "/var/lib/aten_${environment}"; 5 varDir = "/var/lib/aten_${environment}";
6 phpFpm = rec { 6 phpFpm = rec {
7 serviceDeps = [ "postgresql.service" "${environment}-aten-key.service" ];
7 socket = "/var/run/phpfpm/aten-${environment}.sock"; 8 socket = "/var/run/phpfpm/aten-${environment}.sock";
8 pool = '' 9 pool = ''
9 listen = ${socket} 10 listen = ${socket}
diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index 776a02e..58228ed 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -41,6 +41,7 @@ in {
41 }; 41 };
42 }; 42 };
43 43
44 services.myPhpfpm.serviceDependencies.aten_prod = aten_prod.phpFpm.serviceDeps;
44 services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool; 45 services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool;
45 system.activationScripts.aten_prod = aten_prod.activationScript; 46 system.activationScripts.aten_prod = aten_prod.activationScript;
46 system.extraSystemBuilderCmds = '' 47 system.extraSystemBuilderCmds = ''
@@ -59,6 +60,7 @@ in {
59 (lib.mkIf cfg.integration.enable { 60 (lib.mkIf cfg.integration.enable {
60 deployment.keys = aten_dev.keys; 61 deployment.keys = aten_dev.keys;
61 security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; 62 security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null;
63 services.myPhpfpm.serviceDependencies.aten_dev = aten_dev.phpFpm.serviceDeps;
62 services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; 64 services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool;
63 system.activationScripts.aten_dev = aten_dev.activationScript; 65 system.activationScripts.aten_dev = aten_dev.activationScript;
64 system.extraSystemBuilderCmds = '' 66 system.extraSystemBuilderCmds = ''
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;
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}
diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 1c6864c..7552db4 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.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps;
44 services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; 45 services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
45 system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; 46 system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
46 system.extraSystemBuilderCmds = '' 47 system.extraSystemBuilderCmds = ''
@@ -58,6 +59,7 @@ in {
58 (lib.mkIf cfg.integration.enable { 59 (lib.mkIf cfg.integration.enable {
59 deployment.keys = piedsjaloux_dev.keys; 60 deployment.keys = piedsjaloux_dev.keys;
60 security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; 61 security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
62 services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps;
61 services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; 63 services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
62 system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; 64 system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
63 system.extraSystemBuilderCmds = '' 65 system.extraSystemBuilderCmds = ''
diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
index 688b9fd..8dab8dd 100644
--- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
+++ b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
@@ -28,6 +28,7 @@ let
28 ''; 28 '';
29 }; 29 };
30 phpFpm = rec { 30 phpFpm = rec {
31 serviceDeps = [ "mysql.service" "${environment}-piedsjaloux-key.service" ];
31 socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock"; 32 socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock";
32 pool = '' 33 pool = ''
33 listen = ${socket} 34 listen = ${socket}
diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index 97931b9..171d2e7 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -18,6 +18,7 @@ in {
18 config = lib.mkIf cfg.integration.enable { 18 config = lib.mkIf cfg.integration.enable {
19 deployment.keys = tellesflorian_dev.keys; 19 deployment.keys = tellesflorian_dev.keys;
20 security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null; 20 security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
21 services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
21 services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool; 22 services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool;
22 system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript; 23 system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript;
23 system.extraSystemBuilderCmds = '' 24 system.extraSystemBuilderCmds = ''
diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix
index 4c76a76..142ba98 100644
--- a/nixops/modules/websites/tellesflorian/tellesflorian.nix
+++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix
@@ -24,6 +24,11 @@ let
24 ''; 24 '';
25 }; 25 };
26 phpFpm = rec { 26 phpFpm = rec {
27 serviceDeps = [
28 "mysql.service"
29 "${environment}-tellesflorian-passwords-key.service"
30 "${environment}-tellesflorian-key.service"
31 ];
27 socket = "/var/run/phpfpm/floriantelles-${environment}.sock"; 32 socket = "/var/run/phpfpm/floriantelles-${environment}.sock";
28 pool = '' 33 pool = ''
29 listen = ${socket} 34 listen = ${socket}