diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-10 20:56:44 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-10 21:02:06 +0100 |
commit | f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2 (patch) | |
tree | cc29816c7f448d736ca0ac6b24763fca4bb48332 /virtual/modules/websites/piedsjaloux.nix | |
parent | 42429ef0756d9ee41cf0ff0b38210edb3b1637e5 (diff) | |
download | Nix-f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2.tar.gz Nix-f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2.tar.zst Nix-f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2.zip |
Add http configuration to modules and separate production from
integration
Diffstat (limited to 'virtual/modules/websites/piedsjaloux.nix')
-rw-r--r-- | virtual/modules/websites/piedsjaloux.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/virtual/modules/websites/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux.nix index 285fd18..46161c7 100644 --- a/virtual/modules/websites/piedsjaloux.nix +++ b/virtual/modules/websites/piedsjaloux.nix | |||
@@ -26,13 +26,25 @@ in { | |||
26 | 26 | ||
27 | services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; | 27 | services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; |
28 | system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; | 28 | system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; |
29 | services.myWebsites.apacheConfig.piedsjaloux_prod.modules = piedsjaloux_prod.apache.modules; | 29 | services.myWebsites.production.modules = piedsjaloux_prod.apache.modules; |
30 | services.myWebsites.production.vhostConfs.piedsjaloux = { | ||
31 | certName = "piedsjaloux"; | ||
32 | hosts = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ]; | ||
33 | root = piedsjaloux_prod.webRoot; | ||
34 | extraConfig = [ piedsjaloux_prod.apache.vhostConf ]; | ||
35 | }; | ||
30 | }) | 36 | }) |
31 | (lib.mkIf cfg.integration.enable { | 37 | (lib.mkIf cfg.integration.enable { |
32 | security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; | 38 | security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; |
33 | services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; | 39 | services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; |
34 | system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; | 40 | system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; |
35 | services.myWebsites.apacheConfig.piedsjaloux_dev.modules = piedsjaloux_dev.apache.modules; | 41 | services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules; |
42 | services.myWebsites.integration.vhostConfs.piedsjaloux = { | ||
43 | certName = "eldiron"; | ||
44 | hosts = [ "piedsjaloux.immae.eu" ]; | ||
45 | root = piedsjaloux_dev.webRoot; | ||
46 | extraConfig = [ piedsjaloux_dev.apache.vhostConf ]; | ||
47 | }; | ||
36 | }) | 48 | }) |
37 | ]; | 49 | ]; |
38 | } | 50 | } |