]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Change Nath’s name
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 3 Apr 2021 17:19:05 +0000 (19:19 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 3 Apr 2021 17:19:05 +0000 (19:19 +0200)
modules/private/default.nix
modules/private/websites/default.nix
modules/private/websites/nath/villon.nix [moved from modules/private/websites/nathanael/villon.nix with 68% similarity]

index ddc4281cb1c282b81a3914b8ff629fe376c1f6a3..29814aaa60e995c51e0d381c05029a1616824f27 100644 (file)
@@ -60,7 +60,7 @@ set = {
 
   nassimeProd = ./websites/nassime/production.nix;
 
-  nathanaelVillon = ./websites/nathanael/villon.nix;
+  nathVillon = ./websites/nath/villon.nix;
 
   papaMaisonBbc = ./websites/papa/maison_bbc.nix;
   papaSurveillance = ./websites/papa/surveillance.nix;
index 530db59acad4ac20cb663248b3fccba00be5b22d..2542e86526e4b2a35fe9013a4cb8474ac007ac18 100644 (file)
@@ -278,7 +278,7 @@ in
 
       nassime.production.enable = true;
 
-      nathanael.villon.enable = true;
+      nath.villon.enable = true;
 
       papa = {
         surveillance.enable = true;
similarity index 68%
rename from modules/private/websites/nathanael/villon.nix
rename to modules/private/websites/nath/villon.nix
index 7482de1167ef691ee6d870d0a932a447cf03352d..57a1df574162d364535e013fd2e0fc804851e3ef 100644 (file)
@@ -1,18 +1,18 @@
 { lib, pkgs, config,  ... }:
 let
-  cfg = config.myServices.websites.nathanael.villon;
-  varDir = "/var/lib/ftp/nathanael";
-  env = config.myEnv.websites.nathanael;
+  cfg = config.myServices.websites.nath.villon;
+  varDir = "/var/lib/ftp/nath";
+  env = config.myEnv.websites.nath;
   domain = "sntvillon.immae.eu";
   apacheUser = config.services.httpd.Prod.user;
   apacheGroup = config.services.httpd.Prod.group;
 in {
-  options.myServices.websites.nathanael.villon.enable = lib.mkEnableOption "enable Nathanael's website";
+  options.myServices.websites.nath.villon.enable = lib.mkEnableOption "enable Nath's website";
 
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = domain; } ];
 
-    system.activationScripts.nathanael_villon = {
+    system.activationScripts.nath_villon = {
       deps = [ "users" ];
       text = ''
         install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir}
@@ -20,8 +20,8 @@ in {
     };
     security.acme.certs."ftp".extraDomains."${domain}" = null;
 
-    services.websites.env.production.vhostConfs.nathanael_villon = {
-      certName     = "nathanael";
+    services.websites.env.production.vhostConfs.nath_villon = {
+      certName     = "nath";
       certMainHost = domain;
       hosts        = [ domain ];
       root         = varDir;