aboutsummaryrefslogtreecommitdiff
path: root/modules/private
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private')
-rw-r--r--modules/private/default.nix2
-rw-r--r--modules/private/websites/default.nix2
-rw-r--r--modules/private/websites/nath/villon.nix (renamed from modules/private/websites/nathanael/villon.nix)14
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/private/default.nix b/modules/private/default.nix
index ddc4281..29814aa 100644
--- a/modules/private/default.nix
+++ b/modules/private/default.nix
@@ -60,7 +60,7 @@ set = {
60 60
61 nassimeProd = ./websites/nassime/production.nix; 61 nassimeProd = ./websites/nassime/production.nix;
62 62
63 nathanaelVillon = ./websites/nathanael/villon.nix; 63 nathVillon = ./websites/nath/villon.nix;
64 64
65 papaMaisonBbc = ./websites/papa/maison_bbc.nix; 65 papaMaisonBbc = ./websites/papa/maison_bbc.nix;
66 papaSurveillance = ./websites/papa/surveillance.nix; 66 papaSurveillance = ./websites/papa/surveillance.nix;
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix
index 530db59..2542e86 100644
--- a/modules/private/websites/default.nix
+++ b/modules/private/websites/default.nix
@@ -278,7 +278,7 @@ in
278 278
279 nassime.production.enable = true; 279 nassime.production.enable = true;
280 280
281 nathanael.villon.enable = true; 281 nath.villon.enable = true;
282 282
283 papa = { 283 papa = {
284 surveillance.enable = true; 284 surveillance.enable = true;
diff --git a/modules/private/websites/nathanael/villon.nix b/modules/private/websites/nath/villon.nix
index 7482de1..57a1df5 100644
--- a/modules/private/websites/nathanael/villon.nix
+++ b/modules/private/websites/nath/villon.nix
@@ -1,18 +1,18 @@
1{ lib, pkgs, config, ... }: 1{ lib, pkgs, config, ... }:
2let 2let
3 cfg = config.myServices.websites.nathanael.villon; 3 cfg = config.myServices.websites.nath.villon;
4 varDir = "/var/lib/ftp/nathanael"; 4 varDir = "/var/lib/ftp/nath";
5 env = config.myEnv.websites.nathanael; 5 env = config.myEnv.websites.nath;
6 domain = "sntvillon.immae.eu"; 6 domain = "sntvillon.immae.eu";
7 apacheUser = config.services.httpd.Prod.user; 7 apacheUser = config.services.httpd.Prod.user;
8 apacheGroup = config.services.httpd.Prod.group; 8 apacheGroup = config.services.httpd.Prod.group;
9in { 9in {
10 options.myServices.websites.nathanael.villon.enable = lib.mkEnableOption "enable Nathanael's website"; 10 options.myServices.websites.nath.villon.enable = lib.mkEnableOption "enable Nath's website";
11 11
12 config = lib.mkIf cfg.enable { 12 config = lib.mkIf cfg.enable {
13 services.webstats.sites = [ { name = domain; } ]; 13 services.webstats.sites = [ { name = domain; } ];
14 14
15 system.activationScripts.nathanael_villon = { 15 system.activationScripts.nath_villon = {
16 deps = [ "users" ]; 16 deps = [ "users" ];
17 text = '' 17 text = ''
18 install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} 18 install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir}
@@ -20,8 +20,8 @@ in {
20 }; 20 };
21 security.acme.certs."ftp".extraDomains."${domain}" = null; 21 security.acme.certs."ftp".extraDomains."${domain}" = null;
22 22
23 services.websites.env.production.vhostConfs.nathanael_villon = { 23 services.websites.env.production.vhostConfs.nath_villon = {
24 certName = "nathanael"; 24 certName = "nath";
25 certMainHost = domain; 25 certMainHost = domain;
26 hosts = [ domain ]; 26 hosts = [ domain ];
27 root = varDir; 27 root = varDir;