X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;fp=nixops%2Fmodules%2Fwebsites%2Fftp%2Fimmae.nix;h=58cf04889587e401e6442e1ef5eb1dd8eabb19b0;hp=2ba30a138f836de220a9c14d4ad715baf32e7e5f;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f

diff --git a/nixops/modules/websites/ftp/immae.nix b/modules/private/websites/immae/production.nix
similarity index 84%
rename from nixops/modules/websites/ftp/immae.nix
rename to modules/private/websites/immae/production.nix
index 2ba30a1..58cf048 100644
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/modules/private/websites/immae/production.nix
@@ -1,16 +1,12 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
-    cfg = config.services.myWebsites.Immae;
-    varDir = "/var/lib/ftp/immae";
-    env = myconfig.env.websites.immae;
+  cfg = config.myServices.websites.immae.production;
+  varDir = "/var/lib/ftp/immae";
+  env = myconfig.env.websites.immae;
 in {
-  options.services.myWebsites.Immae = {
-    production = {
-      enable = lib.mkEnableOption "enable Immae's website";
-    };
-  };
+  options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
 
-  config = lib.mkIf cfg.production.enable {
+  config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "www.immae.eu"; } ];
 
     services.myPhpfpm.poolConfigs.immae = ''