Add specification for the private config file as a module.

[perso/Immae/Config/Nix.git] / modules / private / websites / capitaines / production.nix

diff --git a/modules/private/websites/capitaines/production.nix b/modules/private/websites/capitaines/production.nix
index fe9c619491d5a7752032a486b72cd52ba856f1e2..044ff1d04b56137f5e443bf3725b23e581384960 100644 (file)
--- a/modules/private/websites/capitaines/production.nix
+++ b/modules/private/websites/capitaines/production.nix
@@ -1,7 +1,7 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
     cfg = config.myServices.websites.capitaines.production;
-    env = myconfig.env.websites.capitaines;
+    env = config.myEnv.websites.capitaines;
     webappName = "capitaines_mastodon";
     root = "/run/current-system/webapps/${webappName}";
     siteDir = ./mastodon_static;
@@ -9,12 +9,9 @@ in {
   options.myServices.websites.capitaines.production.enable = lib.mkEnableOption "enable Capitaines's website";
 
   config = lib.mkIf cfg.enable {
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${siteDir} $out/webapps/${webappName}
-      '';
+    myServices.websites.webappDirs."${webappName}" = siteDir;
 
-    services.websites.production.vhostConfs.capitaines_mastodon = {
+    services.websites.env.production.vhostConfs.capitaines_mastodon = {
       certName     = "capitaines";
       certMainHost = "mastodon.capitaines.fr";
       hosts        = [ "mastodon.capitaines.fr" ];
@@ -31,7 +28,7 @@ in {
       ];
     };
 
-    services.websites.production.vhostConfs.capitaines = {
+    services.websites.env.production.vhostConfs.capitaines = {
       certName   = "capitaines";
       addToCerts = true;
       hosts      = [ "capitaines.fr" ];