aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/chloe/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-16 14:59:22 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-16 14:59:22 +0200
commit906065a0b7aada3282309791a051e71e5e1cf16d (patch)
treea26564f732116b4a2b5784f65566caab6e90a8e2 /nixops/modules/websites/chloe/default.nix
parent50933a04f9db56a6368f40bdfe33e988d1a269df (diff)
downloadNix-906065a0b7aada3282309791a051e71e5e1cf16d.tar.gz
Nix-906065a0b7aada3282309791a051e71e5e1cf16d.tar.zst
Nix-906065a0b7aada3282309791a051e71e5e1cf16d.zip
Move chloe's website keys to secure location
Related issue: https://git.immae.eu/mantisbt/view.php?id=122
Diffstat (limited to 'nixops/modules/websites/chloe/default.nix')
-rw-r--r--nixops/modules/websites/chloe/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index f561834..451a248 100644
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -25,6 +25,7 @@ in {
25 25
26 config = lib.mkMerge [ 26 config = lib.mkMerge [
27 (lib.mkIf cfg.production.enable { 27 (lib.mkIf cfg.production.enable {
28 deployment.keys = chloe_prod.keys;
28 services.myWebsites.commons.stats.enable = true; 29 services.myWebsites.commons.stats.enable = true;
29 services.myWebsites.commons.stats.sites = [ 30 services.myWebsites.commons.stats.sites = [
30 { 31 {
@@ -40,6 +41,7 @@ in {
40 }; 41 };
41 }; 42 };
42 43
44 services.myPhpfpm.serviceDependencies.chloe_prod = chloe_prod.phpFpm.serviceDeps;
43 services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; 45 services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool;
44 services.myPhpfpm.poolPhpConfigs.chloe_prod = '' 46 services.myPhpfpm.poolPhpConfigs.chloe_prod = ''
45 extension=${pkgs.php}/lib/php/extensions/mysqli.so 47 extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -58,7 +60,9 @@ in {
58 }; 60 };
59 }) 61 })
60 (lib.mkIf cfg.integration.enable { 62 (lib.mkIf cfg.integration.enable {
63 deployment.keys = chloe_dev.keys;
61 security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; 64 security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null;
65 services.myPhpfpm.serviceDependencies.chloe_dev = chloe_dev.phpFpm.serviceDeps;
62 services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; 66 services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool;
63 services.myPhpfpm.poolPhpConfigs.chloe_dev = '' 67 services.myPhpfpm.poolPhpConfigs.chloe_dev = ''
64 extension=${pkgs.php}/lib/php/extensions/mysqli.so 68 extension=${pkgs.php}/lib/php/extensions/mysqli.so