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