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 | 1 |
2 files changed, 3 insertions, 0 deletions
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} |