Migrate capitaines.fr

diff --git a/nixops/modules/websites/capitaines/default.nix b/nixops/modules/websites/capitaines/default.nix
index 80739556030568c07b9fb11e3d0e06cdfa7f6a4f..08f6dd3985de5894707047f7445ce54ecd19f8d0 100644 (file)
--- a/nixops/modules/websites/capitaines/default.nix
+++ b/nixops/modules/websites/capitaines/default.nix
@@ -13,16 +13,17 @@ in {
   };
 
   config = lib.mkIf cfg.production.enable {
-    security.acme.certs."capitaines_mastodon" = config.services.myCertificates.certConfig // {
+    security.acme.certs."capitaines" = config.services.myCertificates.certConfig // {
       domain = "mastodon.capitaines.fr";
+      extraDomains = { "capitaines.fr" = null; };
     };
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${siteDir} $out/webapps/${webappName}
       '';
 
-    services.myWebsites.production.vhostConfs.capitaines = {
-      certName    = "capitaines_mastodon";
+    services.myWebsites.production.vhostConfs.capitaines_mastodon = {
+      certName    = "capitaines";
       hosts       = [ "mastodon.capitaines.fr" ];
       root        = root;
       extraConfig = [
@@ -36,5 +37,17 @@ in {
           ''
       ];
     };
+
+    services.myWebsites.production.vhostConfs.capitaines = {
+      certName = "capitaines";
+      hosts    = [ "capitaines.fr" ];
+      root     = "/run/current-system/webapps/_www";
+      extraConfig = [ ''
+        <Directory /run/current-system/webapps/_www>
+          DirectoryIndex index.htm
+          Require all granted
+        </Directory>
+        '' ];
+    };
   };
 }