From 750fe5a43b957b91a26069cf8a4fe19fc7b2633c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 22 Oct 2021 20:07:14 +0200
Subject: Remove webappdirs

---
 modules/private/websites/capitaines/landing_pages.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'modules/private/websites/capitaines')

diff --git a/modules/private/websites/capitaines/landing_pages.nix b/modules/private/websites/capitaines/landing_pages.nix
index b94a398..edba8b9 100644
--- a/modules/private/websites/capitaines/landing_pages.nix
+++ b/modules/private/websites/capitaines/landing_pages.nix
@@ -1,23 +1,21 @@
 { lib, config,  ... }:
 let
   cfg = config.myServices.websites.capitaines.landing_pages;
-  webappdirs = config.services.websites.webappDirsPaths;
   certName = "capitaines";
   domain = "capitaines.fr";
 in {
   options.myServices.websites.capitaines.landing_pages.enable = lib.mkEnableOption "enable Capitaines's landing pages";
 
   config = lib.mkIf cfg.enable {
-    services.websites.webappDirs.capitaines_mastodon = ./mastodon_static;
     services.websites.env.production.vhostConfs.capitaines_mastodon = rec {
       inherit certName;
       certMainHost = "mastodon.${domain}";
       hosts        = [ certMainHost ];
-      root         = webappdirs.capitaines_mastodon;
+      root         = ./mastodon_static;
       extraConfig  = [
         ''
         ErrorDocument 404 /index.html
-        <Directory ${webappdirs.capitaines_mastodon}>
+        <Directory ${./mastodon_static}>
           DirectoryIndex index.html
           Options Indexes FollowSymLinks MultiViews Includes
           Require all granted
@@ -26,16 +24,15 @@ in {
       ];
     };
 
-    services.websites.webappDirs.capitaines_discourse = ./discourse_static;
     services.websites.env.production.vhostConfs.capitaines_discourse = {
       inherit certName;
       addToCerts   = true;
       hosts        = [ "discourse.${domain}" ];
-      root         = webappdirs.capitaines_discourse;
+      root         = ./discourse_static;
       extraConfig  = [
         ''
         ErrorDocument 404 /index.html
-        <Directory ${webappdirs.capitaines_discourse}>
+        <Directory ${./discourse_static}>
           DirectoryIndex index.html
           Options Indexes FollowSymLinks MultiViews Includes
           Require all granted
@@ -48,9 +45,9 @@ in {
       inherit certName;
       addToCerts = true;
       hosts      = [ domain ];
-      root       = webappdirs._www;
+      root       = ../_www;
       extraConfig = [ ''
-        <Directory ${webappdirs._www}>
+        <Directory ${../_www}>
           DirectoryIndex index.htm
           Require all granted
         </Directory>
-- 
cgit v1.2.3