X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fmastodon.nix;h=ffd59dd6fb1a3775668ce796c31991529b707976;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hp=4b9b73ecbfcdbb6ddfcbc0f6187db0b9063b583f;hpb=613aea5685ad4c698386c374474d8853bb736503;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/mastodon.nix b/nixops/modules/websites/tools/mastodon.nix
index 4b9b73e..ffd59dd 100644
--- a/nixops/modules/websites/tools/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   env = myconfig.env.tools.mastodon;
   root = "/run/current-system/webapps/tools_mastodon";
@@ -64,16 +64,16 @@ in {
       dataDir = "/var/lib/mastodon_immae";
     };
 
-    services.myWebsites.tools.modules = [
+    services.websites.tools.modules = [
       "headers" "proxy" "proxy_wstunnel" "proxy_http"
     ];
-    security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon
       '';
-    services.myWebsites.tools.vhostConfs.mastodon = {
+    services.websites.tools.vhostConfs.mastodon = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["mastodon.immae.eu" ];
       root        = root;
       extraConfig = [ ''