X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Femilia%2Fproduction.nix;fp=nixops%2Fmodules%2Fwebsites%2Femilia%2Fdefault.nix;h=2e705a1e5d57d6bde750e47579cda9d96607de62;hp=47257b7a2f1e668b74db880a71341f08211cedfb;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f

diff --git a/nixops/modules/websites/emilia/default.nix b/modules/private/websites/emilia/production.nix
similarity index 90%
rename from nixops/modules/websites/emilia/default.nix
rename to modules/private/websites/emilia/production.nix
index 47257b7..2e705a1 100644
--- a/nixops/modules/websites/emilia/default.nix
+++ b/modules/private/websites/emilia/production.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
-    cfg = config.services.myWebsites.Emilia;
+    cfg = config.myServices.websites.emilia.production;
     env = myconfig.env.websites.emilia;
     varDir = "/var/lib/moodle";
     siteDir = ./moodle;
@@ -40,13 +40,9 @@ let
       // it is intentional because it prevents trailing whitespace problems!
       '';
 in {
-  options.services.myWebsites.Emilia = {
-    production = {
-      enable = lib.mkEnableOption "enable Emilia's website";
-    };
-  };
+  options.myServices.websites.emilia.production.enable = lib.mkEnableOption "enable Emilia's website";
 
-  config = lib.mkIf cfg.production.enable {
+  config = lib.mkIf cfg.enable {
     system.activationScripts.emilia = ''
       install -m 0755 -o wwwrun -g wwwrun -d ${varDir}
       '';