X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fcapitaines%2Fdefault.nix;h=4bbf48806e73501779fe5dafe422273d816ca6f4;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hp=80739556030568c07b9fb11e3d0e06cdfa7f6a4f;hpb=7da3ceece7fe6c49046e97f37fc353db9b8a981c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/capitaines/default.nix b/nixops/modules/websites/capitaines/default.nix
index 8073955..4bbf488 100644
--- a/nixops/modules/websites/capitaines/default.nix
+++ b/nixops/modules/websites/capitaines/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Capitaines;
     env = myconfig.env.websites.capitaines;
@@ -13,19 +13,17 @@ in {
   };
 
   config = lib.mkIf cfg.production.enable {
-    security.acme.certs."capitaines_mastodon" = config.services.myCertificates.certConfig // {
-      domain = "mastodon.capitaines.fr";
-    };
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${siteDir} $out/webapps/${webappName}
       '';
 
-    services.myWebsites.production.vhostConfs.capitaines = {
-      certName    = "capitaines_mastodon";
-      hosts       = [ "mastodon.capitaines.fr" ];
-      root        = root;
-      extraConfig = [
+    services.websites.production.vhostConfs.capitaines_mastodon = {
+      certName     = "capitaines";
+      certMainHost = "mastodon.capitaines.fr";
+      hosts        = [ "mastodon.capitaines.fr" ];
+      root         = root;
+      extraConfig  = [
         ''
         ErrorDocument 404 /index.html
         <Directory ${root}>
@@ -36,5 +34,18 @@ in {
           ''
       ];
     };
+
+    services.websites.production.vhostConfs.capitaines = {
+      certName   = "capitaines";
+      addToCerts = true;
+      hosts      = [ "capitaines.fr" ];
+      root       = "/run/current-system/webapps/_www";
+      extraConfig = [ ''
+        <Directory /run/current-system/webapps/_www>
+          DirectoryIndex index.htm
+          Require all granted
+        </Directory>
+        '' ];
+    };
   };
 }