]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
projects / perso / Immae / Config / Nix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ea0ba77)
Fix converse
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 27 Aug 2022 17:04:29 +0000 (19:04 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 9 Apr 2023 15:16:27 +0000 (17:16 +0200)
modules/private/websites/tools/im/default.nix patch | blob | blame | history
modules/private/websites/tools/im/www/converse.html patch | blob | blame | history

diff --git a/modules/private/websites/tools/im/default.nix b/modules/private/websites/tools/im/default.nix
index 372fa323e465ffa3a2529f858888eb4f96335cad..6420077b11ddd9c7f881d6206a717fd6e3b979f9 100644 (file)
--- a/modules/private/websites/tools/im/default.nix
+++ b/modules/private/websites/tools/im/default.nix
@@ -1,6 +1,11 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.myServices.websites.tools.im;
+  converseVersion = "9.1.1";
+  www = pkgs.runCommand "www" {} ''
+    cp -a ${./www} $out
+    substituteInPlace $out/converse.html --replace {{converseVersion}} ${converseVersion}
+  '';
 in
 {
   options.myServices.websites.tools.im = {
@@ -79,11 +84,11 @@ in
       certName   = "eldiron";
       addToCerts = true;
       hosts      = ["im.immae.fr"];
-      root       = ./www;
+      root       = www;
       extraConfig = [
         ''
           Alias /glowing-bear ${pkgs.glowing-bear}
-          Alias /converse ${./www}/converse.html
+          Alias /converse ${www}/converse.html
           ProxyPreserveHost On
           <Location "/bosh">
             ProxyPass http://localhost:5280/bosh
@@ -99,8 +104,12 @@ in
           ProxyPass /api http://localhost:5280/api
           ProxyPassReverse /api http://localhost:5280/api
           <Directory ${pkgs.glowing-bear}>
-          AllowOverride none
-          Require all granted
+            AllowOverride none
+            Require all granted
+          </Directory>
+          <Directory ${www}>
+            Require all granted
+            AllowOverride none
           </Directory>
           ''
       ];
diff --git a/modules/private/websites/tools/im/www/converse.html b/modules/private/websites/tools/im/www/converse.html
index 936dde4eb3e3689e5d80b7b9e3cf10184d294536..4ca451d7c5326885278554f4e426c353d3240f27 100644 (file)
--- a/modules/private/websites/tools/im/www/converse.html
+++ b/modules/private/websites/tools/im/www/converse.html
@@ -8,17 +8,19 @@
                 <meta name="description" content="Converse: An XMPP chat client which can be integrated into any website" />
                 <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
 
-                <link type="text/css" rel="stylesheet" media="screen" href="https://assets.immae.eu/converse/5.0.4/converse.min.css" />
+                <link type="text/css" rel="stylesheet" media="screen" href="https://assets.immae.eu/converse/{{converseVersion}}/dist/converse.min.css" />
                 <style type="text/css">
                 #conversejs div.chat-msg__text pre {
                         background-color: #eee;
                         padding: 10px;
                 }
                 </style>
-                <script src="https://assets.immae.eu/converse/5.0.4/libsignal-protocol.min.js"></script>
-                <script src="https://assets.immae.eu/converse/5.0.4/converse.min.js"></script>
+                <script src="https://assets.immae.eu/converse/{{converseVersion}}/3rdparty/libsignal-protocol.min.js"></script>
+                <script src="https://assets.immae.eu/converse/{{converseVersion}}/dist/converse.min.js"></script>
                 <script src="https://assets.immae.eu/marked/1.2.6/marked.min.js"></script>
                 <script src="https://assets.immae.eu/markdown-it/10.0.0/markdown-it.min.js"></script>
+        </head>
+        <body>
                 <script>
                         var md = window.markdownit({
                                 html: true,
@@ -50,8 +52,6 @@
                                 whitelisted_plugins: ['markdown'],
                         });
                 </script>
-        </head>
-        <body>
         </body>
 </html>
 
My infrastructure configuration