diff options
Diffstat (limited to 'nixops/modules/websites/chloe/default.nix')
-rw-r--r-- | nixops/modules/websites/chloe/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix index ba72d92..8e801b5 100644 --- a/nixops/modules/websites/chloe/default.nix +++ b/nixops/modules/websites/chloe/default.nix | |||
@@ -25,13 +25,6 @@ in { | |||
25 | secrets.keys = chloe_prod.keys; | 25 | secrets.keys = chloe_prod.keys; |
26 | services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ]; | 26 | services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ]; |
27 | 27 | ||
28 | security.acme.certs."chloe" = config.services.myCertificates.certConfig // { | ||
29 | domain = "osteopathe-cc.fr"; | ||
30 | extraDomains = { | ||
31 | "www.osteopathe-cc.fr" = null; | ||
32 | }; | ||
33 | }; | ||
34 | |||
35 | services.myPhpfpm.serviceDependencies.chloe_prod = chloe_prod.phpFpm.serviceDeps; | 28 | services.myPhpfpm.serviceDependencies.chloe_prod = chloe_prod.phpFpm.serviceDeps; |
36 | services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; | 29 | services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; |
37 | services.myPhpfpm.poolPhpConfigs.chloe_prod = '' | 30 | services.myPhpfpm.poolPhpConfigs.chloe_prod = '' |
@@ -44,15 +37,15 @@ in { | |||
44 | ''; | 37 | ''; |
45 | services.websites.production.modules = chloe_prod.apache.modules; | 38 | services.websites.production.modules = chloe_prod.apache.modules; |
46 | services.websites.production.vhostConfs.chloe = { | 39 | services.websites.production.vhostConfs.chloe = { |
47 | certName = "chloe"; | 40 | certName = "chloe"; |
48 | hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ]; | 41 | certMainHost = "osteopathe-cc.fr"; |
49 | root = chloe_prod.apache.root; | 42 | hosts = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ]; |
50 | extraConfig = [ chloe_prod.apache.vhostConf ]; | 43 | root = chloe_prod.apache.root; |
44 | extraConfig = [ chloe_prod.apache.vhostConf ]; | ||
51 | }; | 45 | }; |
52 | }) | 46 | }) |
53 | (lib.mkIf cfg.integration.enable { | 47 | (lib.mkIf cfg.integration.enable { |
54 | secrets.keys = chloe_dev.keys; | 48 | secrets.keys = chloe_dev.keys; |
55 | security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; | ||
56 | services.myPhpfpm.serviceDependencies.chloe_dev = chloe_dev.phpFpm.serviceDeps; | 49 | services.myPhpfpm.serviceDependencies.chloe_dev = chloe_dev.phpFpm.serviceDeps; |
57 | services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; | 50 | services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; |
58 | services.myPhpfpm.poolPhpConfigs.chloe_dev = '' | 51 | services.myPhpfpm.poolPhpConfigs.chloe_dev = '' |
@@ -66,6 +59,7 @@ in { | |||
66 | services.websites.integration.modules = chloe_dev.apache.modules; | 59 | services.websites.integration.modules = chloe_dev.apache.modules; |
67 | services.websites.integration.vhostConfs.chloe = { | 60 | services.websites.integration.vhostConfs.chloe = { |
68 | certName = "eldiron"; | 61 | certName = "eldiron"; |
62 | addToCerts = true; | ||
69 | hosts = ["chloe.immae.eu" ]; | 63 | hosts = ["chloe.immae.eu" ]; |
70 | root = chloe_dev.apache.root; | 64 | root = chloe_dev.apache.root; |
71 | extraConfig = [ chloe_dev.apache.vhostConf ]; | 65 | extraConfig = [ chloe_dev.apache.vhostConf ]; |