From a0c845b436329624ad33432a701658dc1b52cca6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 16 Apr 2019 01:09:08 +0200 Subject: [PATCH] Add missing service dependencies --- nixops/modules/websites/aten/aten.nix | 1 + nixops/modules/websites/aten/default.nix | 2 ++ nixops/modules/websites/connexionswing/connexionswing.nix | 1 + nixops/modules/websites/connexionswing/default.nix | 2 ++ nixops/modules/websites/ludivine/default.nix | 2 ++ nixops/modules/websites/ludivine/ludivinecassal.nix | 1 + nixops/modules/websites/piedsjaloux/default.nix | 2 ++ nixops/modules/websites/piedsjaloux/piedsjaloux.nix | 1 + nixops/modules/websites/tellesflorian/default.nix | 1 + nixops/modules/websites/tellesflorian/tellesflorian.nix | 5 +++++ 10 files changed, 18 insertions(+) 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 environment = config.environment; varDir = "/var/lib/aten_${environment}"; phpFpm = rec { + serviceDeps = [ "postgresql.service" "${environment}-aten-key.service" ]; socket = "/var/run/phpfpm/aten-${environment}.sock"; pool = '' 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 { }; }; + services.myPhpfpm.serviceDependencies.aten_prod = aten_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool; system.activationScripts.aten_prod = aten_prod.activationScript; system.extraSystemBuilderCmds = '' @@ -59,6 +60,7 @@ in { (lib.mkIf cfg.integration.enable { deployment.keys = aten_dev.keys; security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; + services.myPhpfpm.serviceDependencies.aten_dev = aten_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; system.activationScripts.aten_dev = aten_dev.activationScript; 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 ''; }; phpFpm = rec { + serviceDeps = [ "mysql.service" "${environment}-connexionswing-key.service" ]; socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; phpConfig = '' 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 { }; }; + services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; @@ -62,6 +63,7 @@ in { deployment.keys = connexionswing_dev.keys; security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null; security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null; + services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; 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 { }; }; + services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool; system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript; system.extraSystemBuilderCmds = '' @@ -55,6 +56,7 @@ in { deployment.keys = ludivinecassal_dev.keys; security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null; + services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool; system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript; 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 ''; }; phpFpm = rec { + serviceDeps = [ "mysql.service" "${environment}-ludivinecassal-key.service" ]; socket = "/var/run/phpfpm/ludivinecassal-${environment}.sock"; pool = '' 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 { }; }; + services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; system.extraSystemBuilderCmds = '' @@ -58,6 +59,7 @@ in { (lib.mkIf cfg.integration.enable { deployment.keys = piedsjaloux_dev.keys; security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; + services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; 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 ''; }; phpFpm = rec { + serviceDeps = [ "mysql.service" "${environment}-piedsjaloux-key.service" ]; socket = "/var/run/phpfpm/piedsjaloux-${environment}.sock"; pool = '' 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 { config = lib.mkIf cfg.integration.enable { deployment.keys = tellesflorian_dev.keys; security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null; + services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool; system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript; 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 ''; }; phpFpm = rec { + serviceDeps = [ + "mysql.service" + "${environment}-tellesflorian-passwords-key.service" + "${environment}-tellesflorian-key.service" + ]; socket = "/var/run/phpfpm/floriantelles-${environment}.sock"; pool = '' listen = ${socket} -- 2.41.0