diff options
Diffstat (limited to 'nixops/modules/websites/tellesflorian')
-rw-r--r-- | nixops/modules/websites/tellesflorian/default.nix | 1 | ||||
-rw-r--r-- | nixops/modules/websites/tellesflorian/tellesflorian.nix | 5 |
2 files changed, 6 insertions, 0 deletions
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} |