From 87949cb97f78dad19743352a584af432a4800e03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 3 Apr 2021 19:19:05 +0200 Subject: [PATCH] =?utf8?q?Change=20Nath=E2=80=99s=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- modules/private/default.nix | 2 +- modules/private/websites/default.nix | 2 +- .../websites/{nathanael => nath}/villon.nix | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) rename modules/private/websites/{nathanael => nath}/villon.nix (68%) 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 = { 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; 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 nassime.production.enable = true; - nathanael.villon.enable = true; + nath.villon.enable = true; papa = { surveillance.enable = true; diff --git a/modules/private/websites/nathanael/villon.nix b/modules/private/websites/nath/villon.nix similarity index 68% rename from modules/private/websites/nathanael/villon.nix rename to 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 @@ { 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; -- 2.41.0