aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/florian
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/florian
parent2e48907d64491a06454b342a1a56d03a0835753d (diff)
downloadNix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.gz
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.zst
Nix-29f8cb850d74b456d6481a456311bbf5361d328c.zip
Refactor websites options
Diffstat (limited to 'modules/private/websites/florian')
-rw-r--r--modules/private/websites/florian/app.nix4
-rw-r--r--modules/private/websites/florian/integration.nix4
-rw-r--r--modules/private/websites/florian/production.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 55fb3cb..00fe644 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -21,8 +21,8 @@ in {
21 services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool; 21 services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
22 system.activationScripts.tellesflorian_dev = tellesflorian.activationScript; 22 system.activationScripts.tellesflorian_dev = tellesflorian.activationScript;
23 myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot; 23 myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot;
24 services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules; 24 services.websites.env.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
25 services.websites.integration.vhostConfs.tellesflorian = { 25 services.websites.env.integration.vhostConfs.tellesflorian = {
26 certName = "eldiron"; 26 certName = "eldiron";
27 addToCerts = true; 27 addToCerts = true;
28 hosts = ["app.tellesflorian.com" ]; 28 hosts = ["app.tellesflorian.com" ];
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 424ebd4..e444e69 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -10,8 +10,8 @@ in {
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 security.acme.certs."ftp".extraDomains."florian.immae.eu" = null; 11 security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
12 12
13 services.websites.integration.modules = adminer.apache.modules; 13 services.websites.env.integration.modules = adminer.apache.modules;
14 services.websites.integration.vhostConfs.florian = { 14 services.websites.env.integration.vhostConfs.florian = {
15 certName = "eldiron"; 15 certName = "eldiron";
16 addToCerts = true; 16 addToCerts = true;
17 hosts = [ "florian.immae.eu" ]; 17 hosts = [ "florian.immae.eu" ];
diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 9b310b8..44a262e 100644
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -10,8 +10,8 @@ in {
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 security.acme.certs."ftp".extraDomains."tellesflorian.com" = null; 11 security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
12 12
13 services.websites.production.modules = adminer.apache.modules; 13 services.websites.env.production.modules = adminer.apache.modules;
14 services.websites.production.vhostConfs.florian = { 14 services.websites.env.production.vhostConfs.florian = {
15 certName = "florian"; 15 certName = "florian";
16 certMainHost = "tellesflorian.com"; 16 certMainHost = "tellesflorian.com";
17 hosts = [ "tellesflorian.com" "www.tellesflorian.com" ]; 17 hosts = [ "tellesflorian.com" "www.tellesflorian.com" ];