aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/aten
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-01 12:51:51 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-01 13:32:32 +0200
commit29f8cb850d74b456d6481a456311bbf5361d328c (patch)
tree2bdcdc21780950683d0528da66b050f2a24e3b20 /modules/private/websites/aten
parent2e48907d64491a06454b342a1a56d03a0835753d (diff)
downloadNix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.gz
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.zst
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.zip
Refactor websites options
Diffstat (limited to 'modules/private/websites/aten')
-rw-r--r--modules/private/websites/aten/integration.nix2
-rw-r--r--modules/private/websites/aten/production.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index f8d8b53..0dbc4fa 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -32,7 +32,7 @@ in {
32 32
33 secrets.keys = aten.keys; 33 secrets.keys = aten.keys;
34 services.phpfpm.poolConfigs.aten_dev = aten.phpFpm.pool; 34 services.phpfpm.poolConfigs.aten_dev = aten.phpFpm.pool;
35 services.websites.integration.vhostConfs.aten = { 35 services.websites.env.integration.vhostConfs.aten = {
36 certName = "eldiron"; 36 certName = "eldiron";
37 addToCerts = true; 37 addToCerts = true;
38 hosts = [ "dev.aten.pro" ]; 38 hosts = [ "dev.aten.pro" ];
diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix
index 1a55e8a..0fab309 100644
--- a/modules/private/websites/aten/production.nix
+++ b/modules/private/websites/aten/production.nix
@@ -21,15 +21,15 @@ in {
21 services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool; 21 services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
22 system.activationScripts.aten_prod = aten.activationScript; 22 system.activationScripts.aten_prod = aten.activationScript;
23 myServices.websites.webappDirs."${aten.apache.webappName}" = aten.app.webRoot; 23 myServices.websites.webappDirs."${aten.apache.webappName}" = aten.app.webRoot;
24 services.websites.production.modules = aten.apache.modules; 24 services.websites.env.production.modules = aten.apache.modules;
25 services.websites.production.vhostConfs.aten = { 25 services.websites.env.production.vhostConfs.aten = {
26 certName = "aten"; 26 certName = "aten";
27 certMainHost = "aten.pro"; 27 certMainHost = "aten.pro";
28 hosts = [ "aten.pro" "www.aten.pro" ]; 28 hosts = [ "aten.pro" "www.aten.pro" ];
29 root = aten.apache.root; 29 root = aten.apache.root;
30 extraConfig = [ aten.apache.vhostConf ]; 30 extraConfig = [ aten.apache.vhostConf ];
31 }; 31 };
32 services.websites.production.watchPaths = [ 32 services.websites.env.production.watchPaths = [
33 "/var/secrets/webapps/${aten.app.environment}-aten" 33 "/var/secrets/webapps/${aten.app.environment}-aten"
34 ]; 34 ];
35 }; 35 };