aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/aten
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/aten
parent60dbbd12253f2f7b6994fea1c56fdf3818d0a025 (diff)
downloadNix-a0c845b436329624ad33432a701658dc1b52cca6.tar.gz
Nix-a0c845b436329624ad33432a701658dc1b52cca6.tar.zst
Nix-a0c845b436329624ad33432a701658dc1b52cca6.zip
Add missing service dependencies
Diffstat (limited to 'nixops/modules/websites/aten')
-rw-r--r--nixops/modules/websites/aten/aten.nix1
-rw-r--r--nixops/modules/websites/aten/default.nix2
2 files changed, 3 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 = ''